diff options
| author | Ondrej Filip <feela@network.cz> | 2012-05-11 00:01:29 +0200 |
|---|---|---|
| committer | Ondrej Filip <feela@network.cz> | 2012-05-11 00:01:29 +0200 |
| commit | 72b2db8db7534c52e928618410ec1f18787752c8 (patch) | |
| tree | 7eee7f4c26a36f72e0700e9e5d78056f5329f85c /tools | |
| parent | 2795700c3158fa52b6cf957e9d0b9ad4a27c67a5 (diff) | |
| parent | 95616c820248018f4999972cad315f2da60e4960 (diff) | |
Merge branch 'master' of ssh://git.nic.cz/bird
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 556eba5f..728e5797 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -48,23 +48,23 @@ userdocs progdocs: .dir-stamp 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)/run\"" + echo >>sysdep/paths.h "#define PATH_CONFIG_FILE \"@CONFIG_FILE@\"" + echo >>sysdep/paths.h "#define PATH_CONTROL_SOCKET \"@CONTROL_SOCKET@\"" if test -n "@iproutedir@" ; then echo >>sysdep/paths.h "#define PATH_IPROUTE_DIR \"@iproutedir@\"" ; fi tags: cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` install: all - $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run - $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@ + $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ + $(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@ if test -n "@CLIENT@" ; then \ - $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ; \ + $(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ; \ fi - if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then \ - $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; \ + if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \ + $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ; \ else \ - echo "Not overwriting old bird@SUFFIX@.conf" ; \ + echo "Not overwriting old bird@SUFFIX@.conf" ; \ fi install-docs: |