`make install' now works.

diff --git a/tools/Makefile-top.in b/tools/Makefile-top.in
index 415bc87620ec14f41c3e432d2f75f6597b928549..9e5049efb9ae8cd835fed3dab8c8951daef308f7 100644 (file)
--- a/tools/Makefile-top.in
+++ b/tools/Makefile-top.in
@@ -3,7 +3,7 @@
 
 objdir=@objdir@
 
-all depend tags docs userdocs progdocs:
+all depend tags docs userdocs progdocs install:
        $(MAKE) -C $(objdir) $@
 
 clean:

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 5eb71835d9d187d34e52953d1344fba8c0a0df32..a740b9bf20cd87d4b21b22b2e372a1012f5a0d5d 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -37,6 +37,18 @@ userdocs progdocs: .dir-stamp
 tags:
        cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
 
+install: all
+       $(INSTALL) -d $(sbindir) $(sysconfdir)
+       $(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/
+       if test -n "@CLIENT@" ; then                                                            \
+               $(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/ ;                             \
+       fi
+       if ! test -f $(sysconfdir)/bird.conf ; then                                             \
+               $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird.conf ;       \
+       else                                                                                    \
+               echo "Not overwriting old bird.conf" ;                                          \
+       fi
+
 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

diff --git a/tools/Rules.in b/tools/Rules.in
index 6e786266ec2028d7f5d0b248aa9703c9f381df4d..92dadcf73c71702a317141ff6ef497ee34cd9b68 100644 (file)
--- a/tools/Rules.in
+++ b/tools/Rules.in
@@ -29,6 +29,15 @@ M4=@M4@
 BISON=@BISON@
 FLEX=@FLEX@
 RANLIB=@RANLIB@
+INSTALL=@INSTALL@
+INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_DATA=@INSTALL_DATA@
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+sbindir=@sbindir@
+sysconfdir=@sysconfdir@
 
 ifdef source