Ticket #42858: patch-Makefile.in.diff

File patch-Makefile.in.diff, 4.1 KB (added by jul_bsd@…, 10 years ago)

  • Makefile.in

    old new  
    852852
    853853install-full: install install-conf install-rules
    854854
     855# Destroot issue was reported 8/23/3013: https://redmine.openinfosecfoundation.org/issues/929
    855856install-conf:
    856         install -d "$(e_sysconfdir)"
    857         @test -e "$(e_sysconfdir)/suricata.yaml" || install -m 600 "$(top_srcdir)/suricata.yaml" "$(e_sysconfdir)"
    858         @test -e "$(e_sysconfdir)/classification.config" || install -m 600 "$(top_srcdir)/classification.config" "$(e_sysconfdir)"
    859         @test -e "$(e_sysconfdir)/reference.config" || install -m 600 "$(top_srcdir)/reference.config" "$(e_sysconfdir)"
    860         @test -e "$(e_sysconfdir)/threshold.config" || install -m 600 "$(top_srcdir)/threshold.config" "$(e_sysconfdir)"
    861         install -d "$(e_logfilesdir)"
    862         install -d "$(e_logcertsdir)"
    863         install -d "$(e_rundir)"
    864         install -m 770 -d "$(e_localstatedir)"
     857        install -d "${DESTDIR}$(e_sysconfdir)"
     858        @test -e "${DESTDIR}$(e_sysconfdir)/suricata.yaml" || install -m 600 "$(top_srcdir)/suricata.yaml" "${DESTDIR}$(e_sysconfdir)"
     859        @test -e "${DESTDIR}$(e_sysconfdir)/classification.config" || install -m 600 "$(top_srcdir)/classification.config" "${DESTDIR}$(e_sysconfdir)"
     860        @test -e "${DESTDIR}$(e_sysconfdir)/reference.config" || install -m 600 "$(top_srcdir)/reference.config" "${DESTDIR}$(e_sysconfdir)"
     861        @test -e "${DESTDIR}$(e_sysconfdir)/threshold.config" || install -m 600 "$(top_srcdir)/threshold.config" "${DESTDIR}$(e_sysconfdir)"
     862        install -d "${DESTDIR}$(e_logfilesdir)"
     863        install -d "${DESTDIR}$(e_logcertsdir)"
     864        install -d "${DESTDIR}$(e_rundir)"
     865        install -m 770 -d "${DESTDIR}$(e_localstatedir)"
    865866
    866867install-rules:
    867         install -d "$(e_sysconfrulesdir)"
    868 @HAVE_FETCH_COMMAND_TRUE@@HAVE_WGET_COMMAND_TRUE@       $(HAVE_WGET) -qO - http://rules.emergingthreats.net/open/suricata-2.0/emerging.rules.tar.gz | tar -x -z -C "$(e_sysconfdir)" -f -
    869 @HAVE_FETCH_COMMAND_TRUE@@HAVE_WGET_COMMAND_FALSE@      $(HAVE_CURL) -s http://rules.emergingthreats.net/open/suricata-2.0/emerging.rules.tar.gz | tar -x -z -C "$(e_sysconfdir)" -f -
     868        install -d "${DESTDIR}$(e_sysconfrulesdir)"
     869@HAVE_FETCH_COMMAND_TRUE@@HAVE_WGET_COMMAND_TRUE@       $(HAVE_WGET) -qO - http://rules.emergingthreats.net/open/suricata-2.0/emerging.rules.tar.gz | tar -x -z -C "${DESTDIR}$(e_sysconfdir)" -f -
     870@HAVE_FETCH_COMMAND_TRUE@@HAVE_WGET_COMMAND_FALSE@      $(HAVE_CURL) -s http://rules.emergingthreats.net/open/suricata-2.0/emerging.rules.tar.gz | tar -x -z -C "${DESTDIR}$(e_sysconfdir)" -f -
    870871@HAVE_FETCH_COMMAND_FALSE@      @echo "UNABLE to load ruleset wget or curl are not installed on system."
    871         @test -e "$(e_sysconfrulesdir)decoder-events.rules" || install -m 600 "$(top_srcdir)/rules/decoder-events.rules" "$(e_sysconfrulesdir)"
    872         @test -e "$(e_sysconfrulesdir)stream-events.rules" || install -m 600 "$(top_srcdir)/rules/stream-events.rules" "$(e_sysconfrulesdir)"
    873         @test -e "$(e_sysconfrulesdir)smtp-events.rules" || install -m 600 "$(top_srcdir)/rules/smtp-events.rules" "$(e_sysconfrulesdir)"
    874         @test -e "$(e_sysconfrulesdir)http-events.rules" || install -m 600 "$(top_srcdir)/rules/http-events.rules" "$(e_sysconfrulesdir)"
    875         @test -e "$(e_sysconfrulesdir)dns-events.rules" || install -m 600 "$(top_srcdir)/rules/dns-events.rules" "$(e_sysconfrulesdir)"
     872        @test -e "${DESTDIR}$(e_sysconfrulesdir)decoder-events.rules" || install -m 600 "$(top_srcdir)/rules/decoder-events.rules" "${DESTDIR}$(e_sysconfrulesdir)"
     873        @test -e "${DESTDIR}$(e_sysconfrulesdir)stream-events.rules" || install -m 600 "$(top_srcdir)/rules/stream-events.rules" "${DESTDIR}$(e_sysconfrulesdir)"
     874        @test -e "${DESTDIR}$(e_sysconfrulesdir)smtp-events.rules" || install -m 600 "$(top_srcdir)/rules/smtp-events.rules" "${DESTDIR}$(e_sysconfrulesdir)"
     875        @test -e "${DESTDIR}$(e_sysconfrulesdir)http-events.rules" || install -m 600 "$(top_srcdir)/rules/http-events.rules" "${DESTDIR}$(e_sysconfrulesdir)"
     876        @test -e "${DESTDIR}$(e_sysconfrulesdir)dns-events.rules" || install -m 600 "$(top_srcdir)/rules/dns-events.rules" "${DESTDIR}$(e_sysconfrulesdir)"
    876877        @echo ""
    877878        @echo "You can now start suricata by running as root something like '$(bindir)/suricata -c $(e_sysconfdir)/suricata.yaml -i eth0'."
    878879        @echo ""