[hybrid] [PATCH] Fix broken install-exec-hook target in Makefile
Brad
brad at comstyle.com
Fri Oct 21 10:08:23 EDT 2011
When updating to 7.3 I ran into a local broken install target which
doesn't properly obey DESTDIR so it tries to fiddle with directories
outside of the installation path.
Index: modules/core/Makefile.am
===================================================================
--- modules/core/Makefile.am (revision 1250)
+++ modules/core/Makefile.am (working copy)
@@ -50,9 +50,9 @@
modules: $(modules_LTLIBRARIES)
install-exec-hook:
- if test -d $(pkglibdir)-old; then \
- rm -rf $(pkglibdir)-old; \
+ if test -d $(DESTDIR)$(pkglibdir)-old; then \
+ rm -rf $(DESTDIR)$(pkglibdir)-old; \
fi
- if test -d $(pkglibdir); then \
- mv $(pkglibdir) $(pkglibdir)-old; \
+ if test -d $(DESTDIR)$(pkglibdir); then \
+ mv $(DESTDIR)$(pkglibdir) $(DESTDIR)$(pkglibdir)-old; \
fi
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
More information about the hybrid
mailing list