aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-01-18 00:44:28 +0000
committerJason Woodward2005-01-18 00:44:28 +0000
commit122a2d4c85ec86f6fd94665aae0ced2220132224 (patch)
tree4471ba5e04a3692ee643881ed31fc8416f7728a9
parent1dff5553d74a8e8e9a14710111720c9918210dfb (diff)
downloadslapt-get-122a2d4c85ec86f6fd94665aae0ced2220132224.tar.gz
moved slapt-get from /sbin to /usr/sbin
-rw-r--r--ChangeLog1
-rw-r--r--Makefile14
2 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 69ea5a2..df06126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
0.9.9g Jan 17, 2005
+ * moved slapt-get from /sbin to /usr/sbin
* show packages excluded in transaction report when --remove-obsolete hits
excluded packages
* changed global_config unsigned integers to bool typedef
diff --git a/Makefile b/Makefile
index 0c5f6ad..2321ef8 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ NONLIBOBJS=src/action.o src/main.o
RCDEST=/etc/slapt-get/slapt-getrc
RCSOURCE=example.slapt-getrc
LOCALESDIR=/usr/share/locale
-SBINDIR=/sbin/
+SBINDIR=/usr/sbin/
DEFINES=-DPROGRAM_NAME="\"$(PROGRAM_NAME)\"" -DVERSION="\"$(VERSION)\"" -DRC_LOCATION="\"$(RCDEST)\"" -DENABLE_NLS -DLOCALESDIR="\"$(LOCALESDIR)\""
CFLAGS=-W -Werror -Wall -O2 -ansi -pedantic -Iinclude $(DEFINES) # add -fPIC for amd64
@@ -55,7 +55,7 @@ doinstall:
ln -s /usr/lib/libslapt-$(VERSION).so /usr/lib/libslapt.so
uninstall:
- -rm /sbin/$(PROGRAM_NAME)
+ -rm /$(SBINDIR)/$(PROGRAM_NAME)
-@echo leaving $(RCDEST)
-rm /usr/man/man8/$(PROGRAM_NAME).8.gz
-@echo leaving /var/$(PROGRAM_NAME)
@@ -83,15 +83,15 @@ withlibslaptpkg: withlibslapt dopkg
dopkg:
@mkdir pkg
- @mkdir -p pkg/sbin
+ @mkdir -p pkg/$(SBINDIR)
@mkdir -p pkg/etc/slapt-get
@mkdir -p pkg/install
@mkdir -p pkg/usr/man/man8
@for i in `ls po/ --ignore=slapt-get.pot --ignore=CVS |sed 's/.po//'` ;do mkdir -p pkg$(LOCALESDIR)/$$i/LC_MESSAGES; msgfmt -o pkg$(LOCALESDIR)/$$i/LC_MESSAGES/slapt-get.mo po/$$i.po; done
- @cp $(PROGRAM_NAME) ./pkg/sbin/
- @chown root:bin ./pkg/sbin
- @chown root:bin ./pkg/sbin/$(PROGRAM_NAME)
- @strip ./pkg/sbin/$(PROGRAM_NAME)
+ @cp $(PROGRAM_NAME) ./pkg/$(SBINDIR)
+ @chown root:bin ./pkg/$(SBINDIR)
+ @chown root:bin ./pkg/$(SBINDIR)/$(PROGRAM_NAME)
+ @strip ./pkg/$(SBINDIR)/$(PROGRAM_NAME)
@echo "# See /usr/doc/$(PROGRAM_NAME)-$(VERSION)/example.slapt-getrc " > ./pkg/etc/slapt-get/slapt-getrc.new
@echo "# for example source entries and configuration hints." >> ./pkg/etc/slapt-get/slapt-getrc.new
@cat example.slapt-getrc |grep -v '^#'|grep -v '^$$' >> ./pkg/etc/slapt-get/slapt-getrc.new