Change the install* targets in the Makefiles to honour DESTDIR. This

makes packaging the client for .deb and .rpm easier. Reported separately by nyet and VICODAN. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@164 13b04d17-f746-0410-82c6-800466cd88b0
2012-05-08 14:34:25 +00:00
parent cb0c2aabc2
commit 7ee26d4ed3
26 changed files with 57 additions and 52 deletions
--- a/dll/Makefile.in
+++ b/dll/Makefile.in
@@ -196,19 +196,19 @@ dllinit.o:
 	)

 install: all
-	$(INSTALL) -d $(PLUGINDIR)
+	$(INSTALL) -d $(DESTDIR)$(PLUGINDIR)
 	@( \
 		makeflags=$$2; \
 		target="$@"; \
 		list="$(PLUGINS)"; \
 		for subdir in $$list; do \
-			(cd $$subdir && $(MAKE) $$target) \
+			(cd $$subdir && $(MAKE) 'DESTDIR=$(DESTDIR)' $$target) \
 			|| case "$$makeflags" in *=*) exit 1;; *k*) ;; *) exit 1;; esac; \
 		done; \
 	)
 	@( \
 		if test x"$(PLUGINS)" != x""; then \
-			strip --strip-unneeded $(PLUGINDIR)/*$(SHLIB_SUFFIX) || :; \
+			strip --strip-unneeded $(DESTDIR)$(PLUGINDIR)/*$(SHLIB_SUFFIX) || :; \
 			echo Your plugins [$(PLUGINS)] are now located in $(PLUGINDIR);\
 		fi; \
 	)
--- a/dll/abot/Makefile.in
+++ b/dll/abot/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/acro/Makefile.in
+++ b/dll/acro/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/aim/Makefile.in
+++ b/dll/aim/Makefile.in
@@ -201,4 +201,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/amp/Makefile.in
+++ b/dll/amp/Makefile.in
@@ -193,7 +193,7 @@ depend:
 	gcc -MM $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c > .depend

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)

 audio.o: audio.c ../../include/irc.h ../../include/defs.h \
 ../../include/config.h ../../include/../.config.h \
--- a/dll/arcfour/Makefile.in
+++ b/dll/arcfour/Makefile.in
@@ -180,4 +180,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/autocycle/Makefile.in
+++ b/dll/autocycle/Makefile.in
@@ -180,4 +180,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/blowfish/Makefile.in
+++ b/dll/blowfish/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/cavlink/Makefile.in
+++ b/dll/cavlink/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/cdrom/Makefile.in
+++ b/dll/cdrom/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/encrypt/Makefile.in
+++ b/dll/encrypt/Makefile.in
@@ -178,4 +178,4 @@ distclean: clean


 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/europa/Makefile.in
+++ b/dll/europa/Makefile.in
@@ -182,4 +182,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/fserv/Makefile.in
+++ b/dll/fserv/Makefile.in
@@ -176,4 +176,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/hint/Makefile.in
+++ b/dll/hint/Makefile.in
@@ -177,5 +177,5 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
-	$(INSTALL) $(srcdir)/BitchX.hints $(PLUGINDIR)/@HINT_FILE@
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
+	$(INSTALL) $(srcdir)/BitchX.hints $(DESTDIR)$(PLUGINDIR)/@HINT_FILE@
--- a/dll/identd/Makefile.in
+++ b/dll/identd/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/nap/Makefile.in
+++ b/dll/nap/Makefile.in
@@ -198,4 +198,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/nicklist/Makefile.in
+++ b/dll/nicklist/Makefile.in
@@ -180,4 +180,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/pkga/Makefile.in
+++ b/dll/pkga/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/possum/Makefile.in
+++ b/dll/possum/Makefile.in
@@ -183,4 +183,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/qbx/Makefile.in
+++ b/dll/qbx/Makefile.in
@@ -176,4 +176,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/qmail/Makefile.in
+++ b/dll/qmail/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/wavplay/Makefile.in
+++ b/dll/wavplay/Makefile.in
@@ -177,4 +177,4 @@ distclean: clean
 	$(RM) Makefile

 install:
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)
--- a/dll/xmms/Makefile.in
+++ b/dll/xmms/Makefile.in
@@ -179,4 +179,4 @@ distclean: clean
 	$(RM) Makefile

 install: all
-	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_NAME)$(SHLIB_SUFFIX) $(DESTDIR)$(PLUGINDIR)