r5293 jmb - /trunk/hubbub/build/Makefile.common

netsurf at semichrome.net netsurf at semichrome.net
Tue Sep 9 10:04:03 BST 2008


Author: jmb
Date: Tue Sep  9 04:04:03 2008
New Revision: 5293

URL: http://source.netsurf-browser.org?rev=5293&view=rev
Log:
Make install/uninstall consider DESTDIR

Modified:
    trunk/hubbub/build/Makefile.common

Modified: trunk/hubbub/build/Makefile.common
URL: http://source.netsurf-browser.org/trunk/hubbub/build/Makefile.common?rev=5293&r1=5292&r2=5293&view=diff
==============================================================================
--- trunk/hubbub/build/Makefile.common (original)
+++ trunk/hubbub/build/Makefile.common Tue Sep  9 04:04:03 2008
@@ -90,17 +90,17 @@
 	@$(MAKE) install PREFIX="$(TOP)/dist"
 
 install: release
-	@$(MKDIR) $(MKDIRFLAGS) -p $(PREFIX)/lib/pkgconfig
-	@$(MKDIR) $(MKDIRFLAGS) -p $(PREFIX)/include/hubbub
+	@$(MKDIR) $(MKDIRFLAGS) -p $(DESTDIR)$(PREFIX)/lib/pkgconfig
+	@$(MKDIR) $(MKDIRFLAGS) -p $(DESTDIR)$(PREFIX)/include/hubbub
 	@$(SED) -e 's#PREFIX#$(PREFIX)#' $(COMPONENT).pc.in >$(COMPONENT).pc
-	@$(INSTALL) --mode=644 -t $(PREFIX)/lib $(COMPONENT).a
-	@$(INSTALL) --mode=644 -t $(PREFIX)/lib/pkgconfig $(COMPONENT).pc
-	@$(INSTALL) --mode=644 -t $(PREFIX)/include/hubbub $(filter %.h, $(wildcard include/hubbub/*))
+	@$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/lib $(COMPONENT).a
+	@$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/lib/pkgconfig $(COMPONENT).pc
+	@$(INSTALL) --mode=644 -t $(DESTDIR)$(PREFIX)/include/hubbub $(filter %.h, $(wildcard include/hubbub/*))
 
 uninstall:
-	@$(RM) $(RMFLAGS) $(PREFIX)/lib/$(COMPONENT).a
-	@$(RM) $(RMFLAGS) $(PREFIX)/lib/pkgconfig/$(COMPONENT).pc
-	@$(RM) $(RMFLAGS) -r $(PREFIX)/include/hubbub
+	@$(RM) $(RMFLAGS) $(DESTDIR)$(PREFIX)/lib/$(COMPONENT).a
+	@$(RM) $(RMFLAGS) $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(COMPONENT).pc
+	@$(RM) $(RMFLAGS) -r $(DESTDIR)$(PREFIX)/include/hubbub
 
 $(RELEASEDIR)/deps/created:
 	@$(MKDIR) $(MKDIRFLAGS) $(RELEASEDIR)/deps




More information about the netsurf-commits mailing list