Don't use the install-autostart target when install target is called.

bareos · Feb 17, 2015 · 11277d5 · 11277d5
1 parent fa63055
commit 11277d5
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 20 deletions.
diff --git a/platforms/aix/Makefile.in b/platforms/aix/Makefile.in
@@ -10,7 +10,7 @@
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/alpha/Makefile.in b/platforms/alpha/Makefile.in
@@ -10,7 +10,7 @@
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd
 

diff --git a/platforms/bsdi/Makefile.in b/platforms/bsdi/Makefile.in
@@ -12,7 +12,7 @@ VPATH = @srcdir@
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/freebsd/Makefile.in b/platforms/freebsd/Makefile.in
@@ -13,7 +13,7 @@ SED = /usr/bin/sed
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/gentoo/Makefile.in b/platforms/gentoo/Makefile.in
@@ -12,7 +12,7 @@
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/hurd/Makefile.in b/platforms/hurd/Makefile.in
@@ -10,7 +10,7 @@
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/irix/Makefile.in b/platforms/irix/Makefile.in
@@ -10,7 +10,7 @@
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/mandrake/Makefile.in b/platforms/mandrake/Makefile.in
@@ -10,7 +10,7 @@
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/openbsd/Makefile.in b/platforms/openbsd/Makefile.in
@@ -13,7 +13,7 @@ SED = /usr/bin/sed
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/packaging/bareos.spec b/platforms/packaging/bareos.spec
@@ -551,17 +551,15 @@ export MTX=/usr/sbin/mtx
 
 %install
 %if 0%{?suse_version}
-    # work-around for SLE_11
-    #%%install -d 755 %%{buildroot}%%{_sysconfdir}/init.d
     %makeinstall DESTDIR=%{buildroot} install
+    %makeinstall DESTDIR=%{buildroot} install-autostart
 %else
-    #%%install -d 755 %%{buildroot}%%{_sysconfdir}/rc.d/init.d
     make DESTDIR=%{buildroot} install
+    make DESTDIR=%{buildroot} install-autostart
 %endif
 
 install -d -m 755 %{buildroot}/usr/share/applications
 install -d -m 755 %{buildroot}/usr/share/pixmaps
-
 install -d -m 755 %{buildroot}%{working_dir}
 
 #Cleaning

diff --git a/platforms/redhat/Makefile.in b/platforms/redhat/Makefile.in
@@ -10,7 +10,7 @@
 
 nothing:
 
-install: install-autostart install_logrotate
+install: install_logrotate
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/slackware/Makefile.in b/platforms/slackware/Makefile.in
@@ -16,7 +16,7 @@
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 

diff --git a/platforms/solaris/Makefile.in b/platforms/solaris/Makefile.in
@@ -15,7 +15,7 @@ ALL_INSTALL_TARGETS = install-autostart-fd install-autostart-sd install-autostar
 
 nothing:
 
-install: install-autostart
+install:
 
 install-autostart:
 	@case `uname -r` in \

diff --git a/platforms/suse/Makefile.in b/platforms/suse/Makefile.in
@@ -11,7 +11,7 @@ FIREWALL_DIR = /etc/sysconfig/SuSEfirewall2.d/services/
 
 nothing:
 
-install: install-autostart install-firewall install_logrotate
+install: install-firewall install_logrotate
 
 install_logrotate:
 	@$(MKDIR) $(DESTDIR)/etc/logrotate.d

diff --git a/platforms/systemd/Makefile.in b/platforms/systemd/Makefile.in
@@ -14,7 +14,7 @@ SYSTEMD_TMPFILES = /etc/tmpfiles.d
 
 nothing:
 
-install: install-dir install-conf install-autostart
+install: install-dir install-conf
 
 install-dir:
 	@$(MKDIR) $(DESTDIR)/$(SYSTEMD_UNITDIR)

diff --git a/platforms/unknown/Makefile.in b/platforms/unknown/Makefile.in
@@ -8,9 +8,9 @@
 #
 @MCOMMON@
 
-install: install-autostart
+install:
 
-all: install-autostart
+all:
 
 install-autostart: install-autostart-FD install-autostart-SD install-autostart-DIR