Changeset 18945

Timestamp:

06/01/06 18:06:35 (3 years ago)

Author:

patrick

Message:

Wipe out versioned files and directories in $(instlinks) when (it is highly
likely that) the version has changed.

Files:

• juggler/trunk/modules/sonix/Makefile.inc.in (modified) (3 diffs)
• juggler/trunk/modules/sonix/configure.ac (modified) (2 diffs)

juggler/trunk/modules/sonix/Makefile.inc.in

@@ -36 +36 @@
-
-# Variables whose values are specific to this file.
+data_subdir=    @data_subdir@
-includedir=     @includedir@
-instlinks=      $(topdir)/instlinks
@@ -135 +136 @@
-
-$(PARAM_HEADER): $(ROOT_ABS)/$(PARAM_HEADER).in $(ROOT_ABS)/VERSION
+        @$(MAKE) clean-version-links
-        @$(SHELL) $(scriptdir)/make-ver.sh -o $@                \
-          -i $(ROOT_ABS)/$@.in $(VER_ARGS)
@@ -236 +238 @@
-endif
-
+clean-version-links:
+        @rm -rf $(instlinks)/include/sonix* $(instlinks)/lib*/sonix*    \
+           $(instlinks)/$(data_subdir)/sonix*
+        @for l in $(LIBS) ; do                                          \
+            find $(instlinks) -name "$$l*" -exec rm {} ';' ;            \
+         done
+
-links-all:
-        @$(MAKE) EXTRA_INSTALL_ARGS=-l prefix="$(instlinks)" installworld

juggler/trunk/modules/sonix/configure.ac

@@ -299 +299 @@
-# all cases.  A person would have to be doing something malicious or foolish
-# to make it break.
-SNX_SHARE_DIR=`echo "$datadir/$DATA_VERSION" | sed -e 's|^${prefix}/||'
-`echo "$SNX_SHARE_DIR" | sed -e "${_prefix_exp}"`
+data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"
+"$data_subdir/$DATA_VERSION"
-
-snx_lib_name="sonix$LIBRARY_VERSION"
@@ -353 +353 @@
-DPP_GET_PROJECTDIR
-
+AC_SUBST(data_subdir)
-AC_SUBST(topdir)
-AC_SUBST(UNIX_SNXROOT_ABS)