summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-06-26 01:06:12 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2009-06-26 01:06:12 +0200
commit5004d02cb9df1f3ee231632a8e89929f4eb4f088 (patch)
tree8234ffd37efe0a3f9fc8d376f03287b6182a3184 /tools
parent1876e18d32fa4b21888aae2c984b1b61338c3e60 (diff)
parent99355da18f8598e93d0e55167582da9687eae082 (diff)
downloadbird-5004d02cb9df1f3ee231632a8e89929f4eb4f088.tar
bird-5004d02cb9df1f3ee231632a8e89929f4eb4f088.zip
Merge branch 'master' into dev
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.in18
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8b901ef..6307cf0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -43,24 +43,24 @@ 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)/
+ $(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)/ ; \
+ $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \
fi
- if ! test -f $(sysconfdir)/bird.conf ; then \
- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird.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.conf" ; \
+ 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
- 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