Ticket #23881: patch-makefile_fixes.diff

File patch-makefile_fixes.diff, 4.0 KB (added by anand@…, 15 years ago)

  • Makefile.in

    old new  
    6666includedir = @includedir@
    6767datarootdir = @datarootdir@
    6868datadir = @datadir@
    69 docdir = $(datadir)/doc/vantages
    70 localedir = $(datadir)/locale
     69docdir = @docdir@
     70localedir = @localedir@
    7171
    72 mandir = $(prefix)/man
     72mandir = @mandir@
    7373manpfx = man
    7474
    7575man1ext = .1
    … …  
    9999        $(MAKE) clean -C shttpd-1.42/src
    100100
    101101install: installman installldconfig
    102         -( mkdir -p $(bindir) )
    103         $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/vantaged $(bindir)/vantaged
    104         $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnsfunnel $(bindir)/dnsfunnel
    105         $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnskey-grab $(bindir)/dnskey-grab
    106         $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/create-db.pl  $(bindir)/create-db.pl
    107         $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/vant-setup  $(bindir)/vant-setup
    108         $(INSTALL) -m 755 -d $(libdir)
    109         $(LIBTOOL) --mode=install cp dns/libvdns.la $(libdir)
    110         $(LIBTOOL) --mode=finish $(libdir)
    111         $(INSTALL_PROGRAM) $(INSTALL_MODE) -d $(includedir)/vantages
    112         for i in `ls dns/*.h`; do $(INSTALL_PROGRAM) $(DOC_MODE) $$i $(includedir)/vantages/; done
    113         -( mkdir -p $(docdir) )
    114         -( mkdir -p $(datarootdir)/vantages )
    115         cp -RL sql $(datarootdir)/vantages/
    116         $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.sample $(datarootdir)/vantages/vantaged.conf.sample
    117         $(INSTALL_PROGRAM) $(DOC_MODE) LICENSE $(datarootdir)/vantages/LICENSE
    118         $(INSTALL_PROGRAM) $(DOC_MODE) README $(datarootdir)/vantages/README
    119         $(INSTALL_PROGRAM) $(DOC_MODE) ERRATA $(datarootdir)/vantages/ERRATA
     102        -( mkdir -p $(DESTDIR)$(bindir) )
     103        $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/vantaged $(DESTDIR)$(bindir)/vantaged
     104        $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnsfunnel $(DESTDIR)$(bindir)/dnsfunnel
     105        $(INSTALL_PROGRAM) $(INSTALL_MODE) bin/dnskey-grab $(DESTDIR)$(bindir)/dnskey-grab
     106        $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/create-db.pl $(DESTDIR)$(bindir)/create-db.pl
     107        $(INSTALL_PROGRAM) $(INSTALL_MODE) scripts/vant-setup $(DESTDIR)$(bindir)/vant-setup
     108        $(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
     109        $(LIBTOOL) --mode=install cp dns/libvdns.la $(DESTDIR)$(libdir)
     110        $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
     111        $(INSTALL_PROGRAM) $(INSTALL_MODE) -d $(DESTDIR)$(includedir)/vantages
     112        for i in `ls dns/*.h`; do $(INSTALL_PROGRAM) $(DOC_MODE) $$i $(DESTDIR)$(includedir)/vantages/; done
     113        -( mkdir -p $(DESTDIR)$(docdir)/vantages )
     114        -( mkdir -p $(DESTDIR)$(datarootdir)/vantages )
     115        cp -RL sql $(DESTDIR)$(datarootdir)/vantages/
     116        $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.sample $(DESTDIR)$(docdir)/vantages/vantaged.conf.sample
     117        $(INSTALL_PROGRAM) $(DOC_MODE) LICENSE $(DESTDIR)$(docdir)/vantages/LICENSE
     118        $(INSTALL_PROGRAM) $(DOC_MODE) README $(DESTDIR)$(docdir)/vantages/README
     119        $(INSTALL_PROGRAM) $(DOC_MODE) ERRATA $(DESTDIR)$(docdir)/vantages/ERRATA
    120120        @echo ""
    121121        @grep '^--' README
    122122
    123123installman:
    124         $(INSTALL) -m 755 -d $(man1dir)
    125         $(INSTALL) -m 755 -d $(man5dir)
    126         $(INSTALL) -m 755 -d $(man8dir)
    127         $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnsfunnel.1 $(man1dir)/dnsfunnel.1
    128         $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnskey-grab.1 $(man1dir)/dnskey-grab.1
    129         $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.5 $(man5dir)/vantaged.conf.5
    130         $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.8 $(man8dir)/vantaged.8
     124        $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir)
     125        $(INSTALL) -m 755 -d $(DESTDIR)$(man5dir)
     126        $(INSTALL) -m 755 -d $(DESTDIR)$(man8dir)
     127        $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnsfunnel.1 $(DESTDIR)$(man1dir)/dnsfunnel.1
     128        $(INSTALL_PROGRAM) $(DOC_MODE) doc/dnskey-grab.1 $(DESTDIR)$(man1dir)/dnskey-grab.1
     129        $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.conf.5 $(DESTDIR)$(man5dir)/vantaged.conf.5
     130        $(INSTALL_PROGRAM) $(DOC_MODE) doc/vantaged.8 $(DESTDIR)$(man8dir)/vantaged.8
    131131
    132132installldconfig:
    133133        -( if [ -e /etc/ld.so.conf ]; then if [ "x" = "x`grep '^$(libdir)' /etc/ld.so.conf`" ];then echo "$(libdir)" >> /etc/ld.so.conf; ldconfig; fi; fi )
    134134
    135135setup:
    136         @echo "Seting up database..."
     136        @echo "Setting up database..."
    137137        $(bindir)/vant-setup -d $(datarootdir)/vantages/sql
    138138