From dc16584ac2be1c097acbf8a0b2f6d412214f2a01 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Tue, 2 Jun 2009 00:28:08 +0200
Subject: Small change to make BIRD's IPv6 packaging easier

---
 tools/Makefile.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8b901ef..17b4db7 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -44,12 +44,12 @@ tags:
 
 install: all
 	$(INSTALL) -d $(sbindir) $(sysconfdir) $(localstatedir)
-	$(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/
+	$(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/bird@SUFFIX6@
 	if test -n "@CLIENT@" ; then								\
-		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/ ;				\
+		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/birdc@SUFFIX6@ ;				\
 	fi
-	if ! test -f $(sysconfdir)/bird.conf ; then						\
-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird.conf ;	\
+	if ! test -f $(sysconfdir)/bird.@SUFFIX6@conf ; then						\
+		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird@SUFFIX6@.conf ;	\
 	else											\
 		echo "Not overwriting old bird.conf" ;						\
 	fi
-- 
cgit v1.2.3


From de8f238fdb85bdba8ce4b5988584403cf5dbcd1e Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Tue, 2 Jun 2009 11:00:12 +0200
Subject: Error in test fixed.

---
 tools/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 17b4db7..33e5c25 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -48,7 +48,7 @@ install: all
 	if test -n "@CLIENT@" ; then								\
 		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/birdc@SUFFIX6@ ;				\
 	fi
-	if ! test -f $(sysconfdir)/bird.@SUFFIX6@conf ; then						\
+	if ! test -f $(sysconfdir)/bird@SUFFIX6@.conf ; then						\
 		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird@SUFFIX6@.conf ;	\
 	else											\
 		echo "Not overwriting old bird.conf" ;						\
-- 
cgit v1.2.3


From 26978ec419217fccfbb8901033703ede886e78b7 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Tue, 2 Jun 2009 11:36:07 +0200
Subject: Clean also ipv6 bird.ctl

---
 tools/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 33e5c25..156a2eb 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -51,7 +51,7 @@ install: all
 	if ! test -f $(sysconfdir)/bird@SUFFIX6@.conf ; then						\
 		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird@SUFFIX6@.conf ;	\
 	else											\
-		echo "Not overwriting old bird.conf" ;						\
+		echo "Not overwriting old bird@SUFFIX@.conf" ;						\
 	fi
 
 install-docs:
@@ -60,7 +60,7 @@ install-docs:
 
 clean:
 	find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
-	rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl .dep-stamp
+	rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
 
 distclean: clean
 	rm -f config.* configure sysdep/autoconf.h sysdep/paths.h Makefile Rules
-- 
cgit v1.2.3


From 99355da18f8598e93d0e55167582da9687eae082 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Tue, 2 Jun 2009 12:01:24 +0200
Subject: Inlude DESTDIR in install to make life of packagers easier.

---
 tools/Makefile.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 156a2eb..6307cf0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -43,20 +43,20 @@ tags:
 	cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
 
 install: all
-	$(INSTALL) -d $(sbindir) $(sysconfdir) $(localstatedir)
-	$(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/bird@SUFFIX6@
+	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)
+	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
 	if test -n "@CLIENT@" ; then								\
-		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/birdc@SUFFIX6@ ;				\
+		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
 	fi
-	if ! test -f $(sysconfdir)/bird@SUFFIX6@.conf ; then						\
-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird@SUFFIX6@.conf ;	\
+	if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then						\
+		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ;	\
 	else											\
 		echo "Not overwriting old bird@SUFFIX@.conf" ;						\
 	fi
 
 install-docs:
-	$(INSTALL) -d $(docdir)
-	$(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(docdir)/
+	$(INSTALL) -d $(DESTDIR)/$(docdir)
+	$(INSTALL_DATA) $(srcdir)/doc/{bird,prog}{,-*}.html $(DESTDIR)/$(docdir)/
 
 clean:
 	find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
-- 
cgit v1.2.3