diff options
| author | Martin Mares <mj@ucw.cz> | 2000-05-08 16:19:47 +0200 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2000-05-08 16:19:47 +0200 |
| commit | f9254d2349c7e2e3c110f7850e402d1c11624940 (patch) | |
| tree | af9ae9a6b2ca0107f4a02929fc9e332558b9e0ad /tools | |
| parent | 0bf7386b33fecac40be43f8db5b0ba0356123fd2 (diff) | |
| download | bird-f9254d2349c7e2e3c110f7850e402d1c11624940.tar bird-f9254d2349c7e2e3c110f7850e402d1c11624940.zip | |
Autoconf is *evil*. The sysconfdir and similar variables are unusable in
C includes as they contain substitutions specific to make.
Worked around by creating sysconf/paths.h which is created from
the Makefile instead of by the configure script.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile-top.in | 2 | ||||
| -rw-r--r-- | tools/Makefile.in | 11 | ||||
| -rw-r--r-- | tools/Rules.in | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/tools/Makefile-top.in b/tools/Makefile-top.in index 9e5049e..855c274 100644 --- a/tools/Makefile-top.in +++ b/tools/Makefile-top.in @@ -12,4 +12,4 @@ clean: distclean: clean rm -rf $(objdir) - rm -f config.* configure sysdep/autoconf.h Makefile + rm -f config.* configure sysdep/autoconf.h sysdep/paths.h Makefile diff --git a/tools/Makefile.in b/tools/Makefile.in index a740b9b..fb078d7 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -5,7 +5,7 @@ include Rules .PHONY: all daemon client subdir depend clean distclean tags docs userdocs progdocs -all: .dep-stamp subdir daemon @CLIENT@ +all: sysdep/paths.h .dep-stamp subdir daemon @CLIENT@ daemon: $(exedir)/bird @@ -34,11 +34,16 @@ docs: userdocs progdocs userdocs progdocs: .dir-stamp $(MAKE) -C doc -f $(srcdir_abs)/doc/Makefile $@ +sysdep/paths.h: + echo >sysdep/paths.h "/* Generated by Makefile, don't edit manually! */" + echo >>sysdep/paths.h "#define PATH_CONFIG_DIR \"$(sysconfdir)\"" + echo >>sysdep/paths.h "#define PATH_CONTROL_SOCKET_DIR \"$(localstatedir)\"" + tags: cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` install: all - $(INSTALL) -d $(sbindir) $(sysconfdir) + $(INSTALL) -d $(sbindir) $(sysconfdir) $(localstatedir) $(INSTALL_PROGRAM) -s $(exedir)/bird $(sbindir)/ if test -n "@CLIENT@" ; then \ $(INSTALL_PROGRAM) -s $(exedir)/birdc $(sbindir)/ ; \ @@ -54,5 +59,5 @@ clean: rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl .dep-stamp distclean: clean - rm -f config.* configure sysdep/autoconf.h Makefile Rules + rm -f config.* configure sysdep/autoconf.h sysdep/paths.h Makefile Rules rm -rf .dir-stamp $(clean-dirs) diff --git a/tools/Rules.in b/tools/Rules.in index 92dadcf..2d2a827 100644 --- a/tools/Rules.in +++ b/tools/Rules.in @@ -38,6 +38,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ sbindir=@sbindir@ sysconfdir=@sysconfdir@ +localstatedir=@localstatedir@ ifdef source |