SF.net SVN: safekeep:[746] safekeep/trunk

[<di...@us...>]

Revision: 746
          http://safekeep.svn.sourceforge.net/safekeep/?rev=746&view=rev
Author:   dimi
Date:     2011-03-06 17:39:43 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
Make the 'make install' behave more like the package install

Modified Paths:
--------------
    safekeep/trunk/INSTALL
    safekeep/trunk/Makefile
    safekeep/trunk/safekeep.spec.in

Modified: safekeep/trunk/INSTALL
===================================================================
--- safekeep/trunk/INSTALL	2011-03-06 17:23:43 UTC (rev 745)
+++ safekeep/trunk/INSTALL	2011-03-06 17:39:43 UTC (rev 746)
@@ -12,17 +12,9 @@
    $ make install
 
 NOTE: installing this way is not equivalent to a package install. 
-You will have to manually take care of a number of other
-steps that are automatically taken care of by the packages such as
-creating /etc/safekeep.d, installing the cron job script, creating
-the safekeep user, and so on.
+You will have to manually create the safekeep user on the server,
+and to setup the .ssh directory. 
 
-Please make sure you understand all the ramifications of doing a
-source install before you chose this option. Feel free to ask
-questions on the mailing list:
-     saf...@li...
-if you run into any problems.
-
 INSTALL NOTES
 ~~~~~~~~~~~~~
 

Modified: safekeep/trunk/Makefile
===================================================================
--- safekeep/trunk/Makefile	2011-03-06 17:23:43 UTC (rev 745)
+++ safekeep/trunk/Makefile	2011-03-06 17:39:43 UTC (rev 746)
@@ -97,12 +97,17 @@
 	svn log -v --xml | svn2log.py -D 0 -u doc/users
 
 install:
-	install -m 755 safekeep "/usr/bin/"
-	install -d -m 755 "/etc/safekeep/backup.d/"
-	install -m 755 safekeep.conf "/etc/safekeep/"
-	install -m 755 doc/safekeep.1 "/usr/share/man/man1/"
-	install -m 755 doc/safekeep.conf.5 "/usr/share/man/man5/"
-	install -m 755 doc/safekeep.backup.5 "/usr/share/man/man5/"
+	install -d -m 755 "$(DESTDIR)/usr/bin/"
+	install -m 755 $(name) "$(DESTDIR)/usr/bin/"
+	install -d -m 755 "$(DESTDIR)/etc/$(name)/backup.d"
+	install -m 664 $(name).conf "$(DESTDIR)/etc/$(name)/"
+	install -d -m 755 "$(DESTDIR)/etc/cron.daily"
+	install -m 755 $(name).cron "$(DESTDIR)/etc/cron.daily/$(name)"
+	install -d -m 755 "$(DESTDIR)/usr/share/man/man1/"
+	install -m 444 doc/$(name).1 "$(DESTDIR)/usr/share/man/man1/"
+	install -d -m 755 "$(DESTDIR)/usr/share/man/man5/"
+	install -m 444 doc/$(name).conf.5 "$(DESTDIR)/usr/share/man/man5/"
+	install -m 444 doc/$(name).backup.5 "$(DESTDIR)/usr/share/man/man5/"
 
 tar:
 	svn export -r {'$(timestamp_svn)'} $(svnroot)/safekeep/trunk $(snapshotname)

Modified: safekeep/trunk/safekeep.spec.in
===================================================================
--- safekeep/trunk/safekeep.spec.in	2011-03-06 17:23:43 UTC (rev 745)
+++ safekeep/trunk/safekeep.spec.in	2011-03-06 17:39:43 UTC (rev 746)
@@ -72,17 +72,7 @@
 
 %install
 rm -rf %{buildroot}
-install -d -m 755 "%{buildroot}%{_sysconfdir}/%{name}/backup.d"
-install -m 664 %{name}.conf "%{buildroot}%{_sysconfdir}/%{name}/"
-install -d -m 755 "%{buildroot}%{_sysconfdir}/cron.daily"
-install -m 755 %{name}.cron "%{buildroot}%{_sysconfdir}/cron.daily/%{name}"
-install -d -m 755 "%{buildroot}%{_bindir}/"
-install -m 755 %{name} "%{buildroot}%{_bindir}/"
-install -d -m 755 "%{buildroot}%{_mandir}/man1/"
-install -m 444 doc/%{name}.1 "%{buildroot}%{_mandir}/man1/"
-install -d -m 755 "%{buildroot}%{_mandir}/man5/"
-install -m 444 doc/%{name}.conf.5 "%{buildroot}%{_mandir}/man5/"
-install -m 444 doc/%{name}.backup.5 "%{buildroot}%{_mandir}/man5/"
+make install DESTDIR=%{buildroot}
 install -d -m 750 "%{buildroot}%{homedir}"
 install -d -m 700 "%{buildroot}%{homedir}/.ssh"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.