lots of changes, see CHANGELOG for details

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@537 04377dda-e619-0410-9926-eae83683ac58

1 files changed, 23 insertions, 23 deletions

diff --git a/trunk/Makefile b/trunk/Makefile
index ff0583c..f7d6390 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -5,7 +5,7 @@
 #  under the terms of the GNU General Public License as published by the Free
 #  Software Foundation; either version 2 of the License, or any later version.
 #
-#  This SlackBuild is distributed in the hope that it will be useful, but WITHOUT
+#  This Makefile is distributed in the hope that it will be useful, but WITHOUT
 #  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
@@ -14,6 +14,7 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 
+PACKAGE = simplepkg
 VERSION = 0.6pre31
 BUILD = 1rha
 PREFIX = /usr
@@ -23,7 +24,7 @@ clean:
 	find . -name *~ | xargs rm -f # clean local backups
 
 install_lib:
-	$(INSTALL) -D --mode=0644 lib/common.sh $(DESTDIR)/$(PREFIX)/libexec/simplepkg/common.sh
+	$(INSTALL) -D --mode=0644 lib/common.sh $(DESTDIR)/$(PREFIX)/libexec/$(PACKAGE)/common.sh
 
 install_bin:
 	$(INSTALL) -D --mode=0755 src/simplaret $(DESTDIR)/$(PREFIX)/bin/simplaret
@@ -43,35 +44,34 @@ install_sbin:
 	@cd $(DESTDIR)/usr/sbin && ln -sf jail-upgrade vserver-upgrade
 
 install_doc:
-	$(INSTALL) -D --mode=0644 doc/COPYING $(DESTDIR)/$(PREFIX)/doc/simplepkg-$(VERSION)/COPYING
-	$(INSTALL) -D --mode=0644 doc/TODO $(DESTDIR)/$(PREFIX)/doc/simplepkg-$(VERSION)/TODO
-	$(INSTALL) -D --mode=0644 doc/CHANGELOG $(DESTDIR)/$(PREFIX)/doc/simplepkg-$(VERSION)/CHANGELOG
-	$(INSTALL) -D --mode=0644 doc/README $(DESTDIR)/$(PREFIX)/doc/simplepkg-$(VERSION)/README
-	$(INSTALL) -D --mode=0644 doc/README.pt_BR $(DESTDIR)/$(PREFIX)/doc/simplepkg-$(VERSION)/README.pt_BR
-	$(INSTALL) -D --mode=0644 doc/README.simplaret $(DESTDIR)/$(PREFIX)/doc/simplepkg-$(VERSION)/README.simplaret
-	$(INSTALL) -D --mode=0644 doc/README.simplaret.pt_BR $(DESTDIR)/$(PREFIX)/doc/simplepkg-$(VERSION)/README.simplaret.pt_BR
+	$(INSTALL) -D --mode=0644 doc/COPYING $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/COPYING
+	$(INSTALL) -D --mode=0644 doc/TODO $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/TODO
+	$(INSTALL) -D --mode=0644 doc/CHANGELOG $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/CHANGELOG
+	$(INSTALL) -D --mode=0644 doc/README $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/README
+	$(INSTALL) -D --mode=0644 doc/README.pt_BR $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/README.pt_BR
+	$(INSTALL) -D --mode=0644 doc/README.simplaret $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/README.simplaret
+	$(INSTALL) -D --mode=0644 doc/README.simplaret.pt_BR $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)-$(VERSION)/README.simplaret.pt_BR
 
 install_config:
-	$(INSTALL) -D --mode=0644 conf/simplepkg.conf.new $(DESTDIR)/etc/simplepkg/simplepkg.conf.new
-	$(INSTALL) -D --mode=0644 conf/repos.conf.new $(DESTDIR)/etc/simplepkg/repos.conf.new
-	@mkdir -p $(DESTDIR)/etc/simplepkg/defaults/mkbuild/
-	@cp mkbuild/* $(DESTDIR)/etc/simplepkg/defaults/mkbuild/
+	$(INSTALL) -D --mode=0644 conf/$(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE)/default/$(PACKAGE).conf
+	$(INSTALL) -D --mode=0644 conf/repos.conf $(DESTDIR)/etc/$(PACKAGE)/default/repos.conf
+	@mkdir -p $(DESTDIR)/etc/$(PACKAGE)/defaults/mkbuild/
+	@cp mkbuild/* $(DESTDIR)/etc/$(PACKAGE)/defaults/mkbuild/
 
 install_defaults:
-	@mkdir -p $(DESTDIR)/etc/simplepkg/{defaults/mkbuild,templates}
-	@rsync -av --exclude=.svn templates/* $(DESTDIR)/etc/simplepkg/defaults/templates/
-	@chmod +x $(DESTDIR)/etc/simplepkg/defaults/templates/vserver/vserver.s/*.sh
-	@chmod +x $(DESTDIR)/etc/simplepkg/defaults/templates/vserver-legacy/vserver-legacy.s/*.sh
+	@mkdir -p $(DESTDIR)/etc/$(PACKAGE)/{defaults/mkbuild,templates}
+	@rsync -av --exclude=.svn templates/* $(DESTDIR)/etc/$(PACKAGE)/defaults/templates/
+	@chmod +x $(DESTDIR)/etc/$(PACKAGE)/defaults/templates/vserver/vserver.s/*.sh
+	@chmod +x $(DESTDIR)/etc/$(PACKAGE)/defaults/templates/vserver-legacy/vserver-legacy.s/*.sh
 
 install: clean
 	@make install_lib install_bin install_sbin install_doc install_config install_defaults
 	$(INSTALL) -D --mode=0644 install/slack-desc $(DESTDIR)/install/slack-desc
-	$(INSTALL) -D --mode=0755 install/doinst.sh $(DESTDIR)/install/doinst.sh
+	#$(INSTALL) -D --mode=0755 install/doinst.sh $(DESTDIR)/install/doinst.sh
 
 package:
 	echo "Remember to run this option as root!"
-	@rm -rf /tmp/package-simplepkg
-	@mkdir -p /tmp/package-simplepkg
-	@make DESTDIR=/tmp/package-simplepkg install
-	@cd /tmp/package-simplepkg && makepkg -c y -l y /tmp/simplepkg-$(VERSION)-noarch-$(BUILD).tgz && cd - && rm -rf /tmp/package-simplepkg
-	echo "Remember to run this option as root!"
+	@rm -rf /tmp/package-$(PACKAGE)
+	@mkdir -p /tmp/package-$(PACKAGE)
+	@make DESTDIR=/tmp/package-$(PACKAGE) install
+	@cd /tmp/package-$(PACKAGE) && makepkg -c y -l y /tmp/$(PACKAGE)-$(VERSION)-noarch-$(BUILD).tgz && cd - && rm -rf /tmp/package-$(PACKAGE)