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.)
diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 1df72d7..d449fe1 100644
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -32,9 +32,7 @@
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 @@
#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