From d8508f70b0325cd283bc1551c455cdc3aab011fe Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Mon, 8 May 2000 13:54:59 +0000 Subject: [PATCH] `make install' now works. --- tools/Makefile-top.in | 2 +- tools/Makefile.in | 12 ++++++++++++ tools/Rules.in | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/tools/Makefile-top.in b/tools/Makefile-top.in index 415bc876..9e5049ef 100644 --- 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 5eb71835..a740b9bf 100644 --- 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 6e786266..92dadcf7 100644 --- 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