+ Add full DESTDIR support in the least intrusive way possible. The

  strategy is to leave alone the install targets sprinkled all over
  the Makefiles and instead to two thigns:

    (1) Define new INST_* variants of BINDIR, ETCDIR, MODULEDIR, etc.
	that are the "final" installation locations, and thus may be
	hardcoded into the program.

    (2) Modify the definitions of BINDIR, ETCDIR, MODULEDIR, etc. to
	point to $(DESTDIR)$(INST_*).  These variables can be used in
	the _install targets without any changes.

8 files changed, 130 insertions, 57 deletions

diff --git a/wm/ion/patches/patch-ad b/wm/ion/patches/patch-ad
deleted file mode 100644
index f61a9cb8144..00000000000
--- a/wm/ion/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/08/14 22:40:53 wiz Exp $
-
---- etc/Makefile.orig	2004-07-29 03:10:32.000000000 +0000
-+++ etc/Makefile
-@@ -21,9 +21,9 @@ include $(TOPDIR)/rules.mk
- ######################################
- 
- _install:
--	$(INSTALLDIR) $(ETCDIR)
-+	$(INSTALLDIR) $(EXDIR)
- 	for i in $(ETC); do \
--		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
-+		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
- 	done
--	rm -f $(ETCDIR)/draw.lua
--	ln -s look-cleanviolet.lua $(ETCDIR)/draw.lua
-+	rm -f $(EXDIR)/draw.lua
-+	ln -s look-cleanviolet.lua $(EXDIR)/draw.lua
diff --git a/wm/ion/patches/patch-ae b/wm/ion/patches/patch-ae
index 48dd5cd9e67..281810c1938 100644
--- a/wm/ion/patches/patch-ae
+++ b/wm/ion/patches/patch-ae
@@ -1,17 +1,47 @@
-$NetBSD: patch-ae,v 1.3 2006/08/14 22:40:53 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2008/02/27 22:31:52 jlam Exp $
 
---- pwm/Makefile.orig	2004-07-29 03:10:32.000000000 +0000
+--- pwm/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
 +++ pwm/Makefile
-@@ -55,9 +55,9 @@ pwm: $(OBJS) $(EXT_OBJS)
+@@ -21,23 +21,24 @@ LIBS += $(LTDL_LIBS)
+ EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
+ EXT_OBJS += ../libtu/libtu.a
+ 
+-DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
+-	   -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
+-	   -DLCDIR=\"$(LCDIR)\"
++DEFINES += -DETCDIR=\"$(INST_ETCDIR)\" -DSHAREDIR=\"$(INST_SHAREDIR)\" \
++	   -DEXTRABINDIR=\"$(INST_EXTRABINDIR)\" -DMODULEDIR=\"$(INST_MODULEDIR)\" \
++	   -DLCDIR=\"$(INST_LCDIR)\"
+ 
+ ifndef PWM_ETCDIR
+-PWM_ETCDIR = $(ETCDIR)
++INST_PWM_ETCDIR = $(INST_ETCDIR)
++PWM_ETCDIR = $(DESTDIR)$(INST_PWM_ETCDIR)
+ else
+-DEFINES += -DPWM_ETCDIR=\"$(PWM_ETCDIR)\"
++DEFINES += -DPWM_ETCDIR=\"$(INST_PWM_ETCDIR)\"
+ endif
+ 
+ CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
+ 
+ ifeq ($(PRELOAD_MODULES),1)
+ LDFLAGS += $(foreach mod, $(PWM_MODULE_LIST), -dlpreopen ../$(mod)/$(mod).la)
+-LINKOPTS = -R$(MODULEDIR)
++LINKOPTS = -R$(INST_MODULEDIR)
+ else
+-LINKOPTS = -export-dynamic -R$(MODULEDIR)
++LINKOPTS = -export-dynamic -R$(INST_MODULEDIR)
+ endif
+ 
+ SOURCES = pwm.c
+@@ -55,8 +56,8 @@ pwm: $(OBJS) $(EXT_OBJS)
  
  _install:
  	$(INSTALLDIR) $(BINDIR)
 -	$(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)
+-	# $(STRIP) $(BINDIR)/pwm
 +	$(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)/pwm2
- 	# $(STRIP) $(BINDIR)/pwm
--	$(INSTALLDIR) $(PWM_ETCDIR)
-+	$(INSTALLDIR) $(EXDIR)
++	# $(STRIP) $(BINDIR)/pwm2
+ 	$(INSTALLDIR) $(PWM_ETCDIR)
  	for i in $(ETC); do \
--		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \
-+		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
- 	done
+ 		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \
diff --git a/wm/ion/patches/patch-ah b/wm/ion/patches/patch-ah
index 30762b02f03..f203b4daa70 100644
--- a/wm/ion/patches/patch-ah
+++ b/wm/ion/patches/patch-ah
@@ -1,26 +1,50 @@
-$NetBSD: patch-ah,v 1.4 2007/08/06 18:16:06 jlam Exp $
+$NetBSD: patch-ah,v 1.5 2008/02/27 22:31:52 jlam Exp $
 
---- system-ac.mk.in.orig	2004-04-02 08:17:08.000000000 +0000
+--- system-ac.mk.in.orig	2004-04-02 03:17:08.000000000 -0500
 +++ system-ac.mk.in
-@@ -16,11 +16,11 @@ exec_prefix=@exec_prefix@
+@@ -14,25 +14,35 @@ exec_prefix=@exec_prefix@
+ # probably do not want to modify the following directories:
+ 
  # Main binaries
- BINDIR=@bindir@
+-BINDIR=@bindir@
++INST_BINDIR=@bindir@
++BINDIR=$(DESTDIR)$(INST_BINDIR)
  # Configuration .lua files
 -ETCDIR=@sysconfdir@/@PACKAGE_TARNAME@
-+ETCDIR=@sysconfdir@
++INST_ETCDIR=@sysconfdir@
++ETCDIR=$(DESTDIR)$(INST_ETCDIR)
  # Some .lua files and ion-* shell scripts
- SHAREDIR=@datadir@/@PACKAGE_TARNAME@
+-SHAREDIR=@datadir@/@PACKAGE_TARNAME@
++INST_SHAREDIR=@datadir@/@PACKAGE_TARNAME@
++SHAREDIR=$(DESTDIR)$(INST_SHAREDIR)
  # Manual pages
 -MANDIR=@datadir@/man
-+MANDIR=@mandir@
++INST_MANDIR=@mandir@
++MANDIR=$(DESTDIR)$(INST_MANDIR)
  # Some documents
- DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
+-DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
++INST_DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
++DOCDIR=$(DESTDIR)$(INST_DOCDIR)
+ # Nothing at the moment
+-INCDIR=@includedir@
++INST_INCDIR=@includedir@
++INCDIR=$(DESTDIR)$(INST_INCDIR)
  # Nothing at the moment
-@@ -33,6 +33,7 @@ MODULEDIR=@libdir@/@PACKAGE_TARNAME@
- LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
+-LIBDIR=@libdir@
++INST_LIBDIR=@libdir@
++LIBDIR=$(DESTDIR)$(INST_LIBDIR)
+ # Modules
+-MODULEDIR=@libdir@/@PACKAGE_TARNAME@
++INST_MODULEDIR=@libdir@/@PACKAGE_TARNAME@
++MODULEDIR=$(DESTDIR)$(INST_MODULEDIR)
+ # Compiled Lua source code
+-LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
++INST_LCDIR=@libdir@/@PACKAGE_TARNAME@/lc
++LCDIR=$(DESTDIR)$(INST_LCDIR)
  # ion-completefile (does not belong in SHAREDIR being a binary file)
- EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
-+EXDIR=@datadir@/examples/@PACKAGE_TARNAME@
+-EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
++INST_EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAME@
++EXTRABINDIR=$(DESTDIR)$(INST_EXTRABINDIR)
  
  ##
  ## Modules
diff --git a/wm/ion/patches/patch-ai b/wm/ion/patches/patch-ai
deleted file mode 100644
index fbf22c587dd..00000000000
--- a/wm/ion/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2006/08/14 22:40:53 wiz Exp $
-
---- dock/Makefile.orig	2004-07-29 03:10:32.000000000 +0000
-+++ dock/Makefile
-@@ -28,9 +28,9 @@ include $(TOPDIR)/rules.mk
- ######################################
- 
- _install: module_install
--	$(INSTALLDIR) $(ETCDIR)
-+	$(INSTALLDIR) $(EXDIR)
- 	for i in $(ETC); do \
--		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \
-+		$(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \
- 	done
- 
- ######################################
diff --git a/wm/ion/patches/patch-aj b/wm/ion/patches/patch-aj
index a41c2900eb5..f2286c661ff 100644
--- a/wm/ion/patches/patch-aj
+++ b/wm/ion/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2006/08/14 22:40:53 wiz Exp $
+$NetBSD: patch-aj,v 1.3 2008/02/27 22:31:52 jlam Exp $
 
---- man/Makefile.orig	2004-07-29 03:10:32.000000000 +0000
+--- man/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
 +++ man/Makefile
 @@ -22,7 +22,7 @@ include $(TOPDIR)/rules.mk
  _install:
diff --git a/wm/ion/patches/patch-an b/wm/ion/patches/patch-an
new file mode 100644
index 00000000000..6a4a335341a
--- /dev/null
+++ b/wm/ion/patches/patch-an
@@ -0,0 +1,27 @@
+$NetBSD: patch-an,v 1.1 2008/02/27 22:31:52 jlam Exp $
+
+--- ion/Makefile.orig	2004-07-28 23:10:32.000000000 -0400
++++ ion/Makefile
+@@ -21,17 +21,17 @@ LIBS += $(LTDL_LIBS)
+ EXT_OBJS += ../ioncore/ioncore.a ../luaextl/luaextl.a
+ EXT_OBJS += ../libtu/libtu.a
+ 
+-DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \
+-           -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \
+-	   -DLCDIR=\"$(LCDIR)\"
++DEFINES += -DETCDIR=\"$(INST_ETCDIR)\" -DSHAREDIR=\"$(INST_SHAREDIR)\" \
++           -DEXTRABINDIR=\"$(INST_EXTRABINDIR)\" -DMODULEDIR=\"$(INST_MODULEDIR)\" \
++	   -DLCDIR=\"$(INST_LCDIR)\"
+ 
+ CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
+ 
+ ifeq ($(PRELOAD_MODULES),1)
+ LDFLAGS += $(foreach mod, $(MODULE_LIST), -dlpreopen ../$(mod)/$(mod).la)
+-LINKOPTS = -R$(MODULEDIR)
++LINKOPTS = -R$(INST_MODULEDIR)
+ else
+-LINKOPTS = -export-dynamic -R$(MODULEDIR)
++LINKOPTS = -export-dynamic -R$(INST_MODULEDIR)
+ endif
+ 
+ SOURCES=ion.c
diff --git a/wm/ion/patches/patch-ao b/wm/ion/patches/patch-ao
new file mode 100644
index 00000000000..6f99aedf40d
--- /dev/null
+++ b/wm/ion/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2008/02/27 22:31:52 jlam Exp $
+
+--- libtu/rules.mk.orig	2004-07-28 23:10:32.000000000 -0400
++++ libtu/rules.mk
+@@ -86,7 +86,7 @@ endif
+ 
+ $(MODULE).la: $(OBJS) $(EXT_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) $(LINKOPT) $(LDFLAGS) \
+- 	-rpath $(MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
++ 	-rpath $(INST_MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
+ 
+ module_install:
+ 	$(INSTALLDIR) $(MODULEDIR)
diff --git a/wm/ion/patches/patch-ap b/wm/ion/patches/patch-ap
new file mode 100644
index 00000000000..6e19a66ead1
--- /dev/null
+++ b/wm/ion/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2008/02/27 22:31:52 jlam Exp $
+
+--- rules.mk.orig	2004-07-28 23:10:32.000000000 -0400
++++ rules.mk
+@@ -86,7 +86,7 @@ endif
+ 
+ $(MODULE).la: $(OBJS) $(EXT_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) $(LINKOPT) $(LDFLAGS) \
+- 	-rpath $(MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
++ 	-rpath $(INST_MODULEDIR) $(OBJS) $(EXT_OBJS) -o $@
+ 
+ module_install:
+ 	$(INSTALLDIR) $(MODULEDIR)