Fix upstream branch

[mirror_smartmontools-debian.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index da765f73dc80e1042561c6a878c663ef88045404..c496bc9e202cfe42295cacb8592f05fcb2d22d2e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-<<<<<<< HEAD
 # $Id: Makefile.am 4299 2016-04-16 19:45:57Z chrfranke $
-=======
-# $Id: Makefile.am 4102 2015-06-01 19:25:47Z chrfranke $
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 #
 
 @SET_MAKE@
@@ -269,13 +265,8 @@ endif
 all-local: $(extra_MANS)
 install-man: $(extra_MANS)
        @$(NORMAL_INSTALL)
-<<<<<<< HEAD
        $(MKDIR_P) '$(DESTDIR)$(mandir)/man4'
        $(MKDIR_P) '$(DESTDIR)$(mandir)/man1m'
-=======
-       $(mkinstalldirs) '$(DESTDIR)$(mandir)/man4'
-       $(mkinstalldirs) '$(DESTDIR)$(mandir)/man1m'
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
        for i in $(extra_MANS); do \
          if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
          else file=$$i; fi; \
@@ -338,11 +329,7 @@ sysconf_DATA = smartd.conf
 
 # If modified smartd.conf exists install smartd.conf.sample instead
 install-sysconfDATA: $(sysconf_DATA)
-<<<<<<< HEAD
        $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'
-=======
-       $(mkinstalldirs) '$(DESTDIR)$(sysconfdir)'
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
        @s="$(srcdir)/smartd.conf"; \
        f="$(DESTDIR)$(sysconfdir)/smartd.conf$(smartd_suffix)"; \
        if test -z "$(smartd_suffix)" && test -f "$$f"; then \
@@ -513,11 +500,7 @@ initd_DATA_install = install-initdDATA-generic
 initd_DATA_uninstall = uninstall-initdDATA-generic
 
 install-initdDATA-generic: $(initd_DATA)
-<<<<<<< HEAD
        $(MKDIR_P) '$(DESTDIR)$(initddir)'
-=======
-       $(mkinstalldirs) '$(DESTDIR)$(initddir)'
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
        $(INSTALL_SCRIPT) '$(top_builddir)/$(initdfile)' '$(DESTDIR)$(initddir)/smartd$(smartd_suffix)'
 
 uninstall-initdDATA-generic:
@@ -541,13 +524,8 @@ systemdsystemunit_DATA = smartd.service
 endif
 
 smartd.service: smartd.service.in Makefile
-<<<<<<< HEAD
        @echo ' $$(SMARTD_SERVICE_FILTER) < $(srcdir)/smartd.service.in > $@'
        @{ \
-=======
-       @echo '  cat $(srcdir)/smartd.service.in | $$(SMARTD_SERVICE_FILTER) > $@'
-       @cat $(srcdir)/smartd.service.in | \
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
        sed 's|/usr/local/sbin/smartd|$(sbindir)/smartd|' | \
        if test -n '$(systemdenvfile)'; then \
          sed 's|/usr/local/etc/sysconfig/smartmontools|$(systemdenvfile)|'; \
@@ -561,13 +539,8 @@ smartd.service: smartd.service.in Makefile
 installdirs-local:
        @for d in '$(smartdplugindir)' '$(savestatesdir)' '$(attributelogdir)'; do \
          test -n "$$d" || continue; \
-<<<<<<< HEAD
          echo " $(MKDIR_P) '$(DESTDIR)$$d'"; \
          $(MKDIR_P) "$(DESTDIR)$$d" || exit 1; \
-=======
-         echo " $(mkinstalldirs) '$(DESTDIR)$$d'"; \
-         $(mkinstalldirs) "$(DESTDIR)$$d" || exit 1; \
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
        done
 
 install-data-local: installdirs-local
@@ -575,11 +548,7 @@ install-data-local: installdirs-local
 #
 # Build man pages
 #
-<<<<<<< HEAD
 MAN_FILTER = { \
-=======
-MAN_FILTER = \
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     sed -e 's|CURRENT_SVN_VERSION|$(releaseversion)|g' \
         -e "s|CURRENT_SVN_DATE|`sed -n 's,^.*DATE[^"]*"\([^"]*\)".*$$,\1,p' svnversion.h`|g" \
         -e "s|CURRENT_SVN_REV|`sed -n 's,^.*REV[^"]*"\([^"]*\)".*$$,r\1,p' svnversion.h`|g" \
@@ -600,14 +569,11 @@ MAN_FILTER = \
     else \
       sed '/^\.\\" %IF ENABLE_DRIVEDB/,/^\.\\" %ENDIF ENABLE_DRIVEDB/ s,^,.\\"\# ,' ; \
     fi | \
-<<<<<<< HEAD
     if test '$(with_update_smart_drivedb)' = 'yes'; then \
       cat; \
     else \
       sed '/^\.\\" %IF ENABLE_UPDATE_SMART_DRIVEDB/,/^\.\\" %ENDIF ENABLE_UPDATE_SMART_DRIVEDB/ s,^,.\\"\# ,' ; \
     fi | \
-=======
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     if test -n '$(initddir)'; then \
       sed 's|/usr/local/etc/rc\.d/init\.d/|$(initddir)/|g' ; \
     else \
@@ -633,14 +599,11 @@ MAN_FILTER = \
     else \
       sed '/^\.\\" %IF ENABLE_CAPABILITIES/,/^\.\\" %ENDIF ENABLE_CAPABILITIES/ s,^,.\\"\# ,' ; \
     fi | \
-<<<<<<< HEAD
     if test '$(with_nvme_devicescan)' = 'yes'; then \
       cat; \
     else \
       sed '/^\.\\" %IF ENABLE_NVME_DEVICESCAN/,/^\.\\" %ENDIF ENABLE_NVME_DEVICESCAN/ s,^,.\\"\# ,' ; \
     fi | \
-=======
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
     if test -n '$(os_man_filter)'; then \
       sed -e 's,OS_MAN_FILTER,$(os_man_filter),g' \
           -e '/^\.\\" %IF NOT OS .*$(os_man_filter)/,/^.\\" %ENDIF NOT OS .*$(os_man_filter)/ s,^,.\\"\# ,' \