Changeset 18902

Timestamp:

05/25/06 16:43:49 (3 years ago)

Author:

dshipton

Message:

Install into the versioned directories.

Files:

• juggler/trunk/modules/vrjuggler/vrjconfig/configure.ac (modified) (3 diffs)
• juggler/trunk/modules/vrjuggler/vrjconfig/make.defs.mk.in (modified) (1 diff)

juggler/trunk/modules/vrjuggler/vrjconfig/configure.ac

@@ -48 +48 @@
-# Command-line arguments (--enable-option, --with-pkg=package_name).
-# -----------------------------------------------------------------------------
-
+
+
+
+
-# -------------------------------------------- #
-# --with-pkg[=arg] and --without-pkg arguments #
@@ -173 +176 @@
-# Finalize substitution settings.
-# -----------------------------------------------------------------------------
+#
+
+VJ_VERSION_GROK(../VERSION)
+
+if test "x$ENABLE_VERSIONING" = "xyes" ; then
+   VRJ_VERSION_DOT="$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION"
+   DATA_VERSION="vrjuggler-$VRJ_VERSION_DOT"
+   PLUGIN_DIR_VERSION="vrjuggler-$VRJ_VERSION_DOT"
+
+# If versioning is disabled, then none of the version variables need to be
+# set except for $DATA_VERSION. Its use is different than the others. The
+# important thing to note is that the directory name is unversioned in this
+# case.
+else
+   DATA_VERSION="vrjuggler"
+   PLUGIN_DIR_VERSION="vrjuggler"
+fi
-
-# Define the base path to the source directory using $(VJROOT_ABS) as an
@@ -207 +227 @@
-AC_SUBST(JUGGLERROOT_ABS)
-
+AC_SUBST(DATA_VERSION)
+AC_SUBST(PLUGIN_DIR_VERSION)
-AC_SUBST(ANT)
-AC_SUBST(RM_LN)

juggler/trunk/modules/vrjuggler/vrjconfig/make.defs.mk.in

@@ -53 +53 @@
-# Base variables needed by all makefiles.
-# -----------------------------------------------------------------------------
-vrjuggler
+@DATA_VERSION@
-releasedir=             @JUGGLERROOT_ABS@/release
-scriptdir=              $(releasedir)/scripts