diff options
author | paul <paul> | 2003-10-24 04:24:39 +0000 |
---|---|---|
committer | paul <paul> | 2003-10-24 04:24:39 +0000 |
commit | 04bd484bf272dd580349c832f84cf5ffa27003bb (patch) | |
tree | 9f9c50fda664e0ce62d43af14ec7ec546f801547 /zebra | |
parent | e92fbaf27ea028d4def1246b7fadb2096bfa4d8d (diff) |
2003-10-24 Paul Jakma <paul@dishone.st>
* configure.ac: Check for fcntl()
* {bgpd,ospf,ospf6d,ripd,ripngd}/Makefile.am: Install conf file via
regular automake means, not magic install incantations, see
bug #38.
* lib/Makefile.am: install the headers, needed to link libzebra.a
(and hence libospf.a, OSPF-API, etc.)
Diffstat (limited to 'zebra')
-rw-r--r-- | zebra/Makefile.am | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/zebra/Makefile.am b/zebra/Makefile.am index 1df72d73..d449fe16 100644 --- a/zebra/Makefile.am +++ b/zebra/Makefile.am @@ -32,9 +32,7 @@ zebra_LDADD = ../lib/libzebra.a $(otherobj) $(LIBCAP) $(LIB_IPV6) zebra_DEPENDENCIES = $(otherobj) -sysconf_DATA = zebra.conf.sample - -EXTRA_DIST = $(sysconf_DATA) if_ioctl.c if_netlink.c if_proc.c if_sysctl.c \ +EXTRA_DIST = if_ioctl.c if_netlink.c if_proc.c if_sysctl.c \ ipforward_aix.c ipforward_ews.c ipforward_proc.c \ ipforward_solaris.c ipforward_sysctl.c rt_ioctl.c rt_netlink.c \ rt_socket.c rtread_netlink.c rtread_proc.c rtread_sysctl.c \ @@ -44,15 +42,5 @@ EXTRA_DIST = $(sysconf_DATA) if_ioctl.c if_netlink.c if_proc.c if_sysctl.c \ #client : client_main.o ../lib/libzebra.a # $(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6) -install-sysconfDATA: $(sysconf_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - @list='$(sysconf_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \ - $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \ - $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \ - fi; fi; \ - done +quaggaconfdir = $(sysconfdir) +dist_quaggaconf_DATA = zebra.conf.sample |