[bind10-dev] PATCH: rip out broken use of DESTDIR

[Jan Engelhardt]

make install DESTDIR="/usr/src/packages/BUILDROOT/bind10-0-20110120" 
would give me files called
/usr/src/packages/BUILDROOT/bind10-0-20110120/usr/src/packages/BUILDROOT/bind10-0-20110120/usr/share/bind10-devel/...,
which is one too much wrong.

---
 src/bin/auth/Makefile.am     |    2 +-
 src/bin/bind10/Makefile.am   |    3 +--
 src/bin/bindctl/Makefile.am  |    2 +-
 src/bin/cfgmgr/Makefile.am   |    1 -
 src/bin/cmdctl/Makefile.am   |    3 +--
 src/bin/msgq/Makefile.am     |    1 -
 src/bin/resolver/Makefile.am |    2 +-
 src/bin/stats/Makefile.am    |    3 +--
 src/bin/usermgr/Makefile.am  |    3 +--
 src/bin/xfrin/Makefile.am    |    3 +--
 src/bin/xfrout/Makefile.am   |    3 +--
 src/bin/zonemgr/Makefile.am  |    2 +-
 12 files changed, 10 insertions(+), 18 deletions(-)

Index: bind10-devel-20110120/src/bin/auth/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/auth/Makefile.am
+++ bind10-devel-20110120/src/bin/auth/Makefile.am
@@ -55,6 +55,6 @@ b10_auth_LDADD += $(SQLITE_LIBS)
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # and can't use @datadir@ because doesn't expand default ${prefix}
-b10_authdir = $(DESTDIR)$(pkgdatadir)
+b10_authdir = $(pkgdatadir)
 b10_auth_DATA = auth.spec
 
Index: bind10-devel-20110120/src/bin/bind10/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/bind10/Makefile.am
+++ bind10-devel-20110120/src/bin/bind10/Makefile.am
@@ -5,7 +5,7 @@ CLEANFILES = bind10 bind10.pyc
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
-bind10dir = $(DESTDIR)$(pkgdatadir)
+bind10dir = $(pkgdatadir)
 bind10_DATA = bob.spec
 EXTRA_DIST = bob.spec
 
@@ -19,7 +19,6 @@ bind10.8: bind10.xml
 
 endif
 
-# TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 bind10: bind10.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
Index: bind10-devel-20110120/src/bin/bindctl/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/bindctl/Makefile.am
+++ bind10-devel-20110120/src/bin/bindctl/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = $(man_MANS) bindctl.xml
 python_PYTHON = __init__.py bindcmd.py cmdparse.py exception.py moduleinfo.py mycollections.py
 pythondir = $(pyexecdir)/bindctl
 
-bindctldir = $(DESTDIR)$(pkgdatadir)
+bindctldir = $(pkgdatadir)
 
 CLEANFILES = bindctl
 
Index: bind10-devel-20110120/src/bin/cfgmgr/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/cfgmgr/Makefile.am
+++ bind10-devel-20110120/src/bin/cfgmgr/Makefile.am
@@ -19,7 +19,6 @@ b10-cfgmgr.8: b10-cfgmgr.xml
 
 endif
 
-# TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-cfgmgr: b10-cfgmgr.py
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" b10-cfgmgr.py >$@
Index: bind10-devel-20110120/src/bin/cmdctl/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/cmdctl/Makefile.am
+++ bind10-devel-20110120/src/bin/cmdctl/Makefile.am
@@ -4,7 +4,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-cmdctl
 
-b10_cmdctldir = $(DESTDIR)$(pkgdatadir)
+b10_cmdctldir = $(pkgdatadir)
 
 # NOTE: this will overwrite on install
 # So these generic copies are placed in share/bind10 instead of to etc
@@ -33,7 +33,6 @@ endif
 cmdctl.spec: cmdctl.spec.pre
 	$(SED) -e "s|@@SYSCONFDIR@@|$(sysconfdir)|" cmdctl.spec.pre >$@
 
-# TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-cmdctl: cmdctl.py
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@
Index: bind10-devel-20110120/src/bin/msgq/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/msgq/Makefile.am
+++ bind10-devel-20110120/src/bin/msgq/Makefile.am
@@ -16,7 +16,6 @@ b10-msgq.8: msgq.xml
 
 endif
 
-# TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-msgq: msgq.py
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" msgq.py >$@
Index: bind10-devel-20110120/src/bin/resolver/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/resolver/Makefile.am
+++ bind10-devel-20110120/src/bin/resolver/Makefile.am
@@ -52,6 +52,6 @@ b10_resolver_LDFLAGS = -pthread
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # and can't use @datadir@ because doesn't expand default ${prefix}
-b10_resolverdir = $(DESTDIR)$(pkgdatadir)
+b10_resolverdir = $(pkgdatadir)
 b10_resolver_DATA = resolver.spec
 
Index: bind10-devel-20110120/src/bin/stats/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/stats/Makefile.am
+++ bind10-devel-20110120/src/bin/stats/Makefile.am
@@ -5,7 +5,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 pkglibexec_SCRIPTS = b10-stats
 noinst_SCRIPTS = b10-stats_stub
 
-b10_statsdir = $(DESTDIR)$(pkgdatadir)
+b10_statsdir = $(pkgdatadir)
 b10_stats_DATA = stats.spec
 
 CLEANFILES = stats.spec b10-stats stats.pyc stats.pyo b10-stats_stub stats_stub.pyc stats_stub.pyo
@@ -23,7 +23,6 @@ endif
 stats.spec: stats.spec.pre
 	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" stats.spec.pre >$@
 
-# TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-stats: stats.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
Index: bind10-devel-20110120/src/bin/usermgr/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/usermgr/Makefile.am
+++ bind10-devel-20110120/src/bin/usermgr/Makefile.am
@@ -1,6 +1,6 @@
 sbin_SCRIPTS = b10-cmdctl-usermgr
 
-b10_cmdctl_usermgrdir = $(DESTDIR)$(pkgdatadir)
+b10_cmdctl_usermgrdir = $(pkgdatadir)
 
 CLEANFILES=	b10-cmdctl-usermgr
 
@@ -14,7 +14,6 @@ b10-cmdctl-usermgr.8: b10-cmdctl-usermgr
 
 endif
 
-# TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-cmdctl-usermgr: b10-cmdctl-usermgr.py
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" b10-cmdctl-usermgr.py >$@
Index: bind10-devel-20110120/src/bin/xfrin/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/xfrin/Makefile.am
+++ bind10-devel-20110120/src/bin/xfrin/Makefile.am
@@ -4,7 +4,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-xfrin
 
-b10_xfrindir = $(DESTDIR)$(pkgdatadir)
+b10_xfrindir = $(pkgdatadir)
 b10_xfrin_DATA = xfrin.spec
 
 CLEANFILES = b10-xfrin xfrin.pyc 
@@ -20,7 +20,6 @@ b10-xfrin.8: b10-xfrin.xml
 
 endif
 
-# TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-xfrin: xfrin.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
Index: bind10-devel-20110120/src/bin/xfrout/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/xfrout/Makefile.am
+++ bind10-devel-20110120/src/bin/xfrout/Makefile.am
@@ -4,7 +4,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-xfrout
 
-b10_xfroutdir = $(DESTDIR)$(pkgdatadir)
+b10_xfroutdir = $(pkgdatadir)
 b10_xfrout_DATA = xfrout.spec
 
 CLEANFILES=	b10-xfrout xfrout.pyc xfrout.spec
@@ -23,7 +23,6 @@ endif
 xfrout.spec: xfrout.spec.pre
 	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.spec.pre >$@
 
-# TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-xfrout: xfrout.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
Index: bind10-devel-20110120/src/bin/zonemgr/Makefile.am
===================================================================
--- bind10-devel-20110120.orig/src/bin/zonemgr/Makefile.am
+++ bind10-devel-20110120/src/bin/zonemgr/Makefile.am
@@ -4,7 +4,7 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-zonemgr
 
-b10_zonemgrdir = $(DESTDIR)$(pkgdatadir)
+b10_zonemgrdir = $(pkgdatadir)
 b10_zonemgr_DATA = zonemgr.spec
 
 CLEANFILES = b10-zonemgr zonemgr.pyc zonemgr.spec