[xiph-commits] r3777 - liboggz/trunk/src/tools

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-11-13 23:36:27 -0800 (Thu, 13 Nov 2008)
New Revision: 3777

Modified:
   liboggz/trunk/src/tools/Makefile.am
Log:
use $(LN_S) and $(RM) for installing and uninstalling symlinks to deprecated
tool names.

Also add a comment to the Makefile.am based on Ralph's observation that:
  According to the docs, AC_PROG_LN_S will substitute 'ln' or 'cp -p' if
  the system doesn't support 'ln -s'. So that makes it more likely for
  the install to work, but may break the 'was this me?' test in the
  uninstall target.


Modified: liboggz/trunk/src/tools/Makefile.am
===================================================================
--- liboggz/trunk/src/tools/Makefile.am	2008-11-13 09:37:29 UTC (rev 3776)
+++ liboggz/trunk/src/tools/Makefile.am	2008-11-14 07:36:27 UTC (rev 3777)
@@ -71,16 +71,20 @@
 install-exec-local:
 	for p in dump diff info merge rip ; do \
 	  if test -e $(exec_prefix)/bin/oggz$$p ; then \
-	    rm $(exec_prefix)/bin/oggz$$p ; \
-	    ln -s $(exec_prefix)/bin/oggz-$$p $(exec_prefix)/bin/oggz$$p ; \
+	    $(RM) $(exec_prefix)/bin/oggz$$p ; \
+	    $(LN_S) $(exec_prefix)/bin/oggz-$$p $(exec_prefix)/bin/oggz$$p ; \
 	  fi ; \
 	done
 
 # On 'make uninstall', remove the deprecated tool -- but only if it is a
 # symlink, to keep to the policy of only uninstalling what we installed.
+# Note that the $(LN_S) above may be substitued with "cp -p" on systems that
+# do not have ln, so the test below will fail. As a result, 'make uninstall'
+# will fail to uninstall the copied versions of oggzdump, oggzdiff etc. on
+# such systems.
 uninstall-local:
 	for p in dump diff info merge rip ; do \
 	  if test -L $(exec_prefix)/bin/oggz$$p ; then \
-	    rm $(exec_prefix)/bin/oggz$$p ; \
+	    $(RM) $(exec_prefix)/bin/oggz$$p ; \
 	  fi ; \
 	done