summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-04-01 09:10:06 +0000
committerJason Woodward2005-04-01 09:10:06 +0000
commit4ad3d5a4eccf4a71bbef90e2ab5afac65b0691b3 (patch)
treeeea322697a7a26bd1f11dd85a7e73782a6bdd879
parenta93826dd2c93e66d6131cb98ce46e299b3083974 (diff)
downloadslapt-get-4ad3d5a4eccf4a71bbef90e2ab5afac65b0691b3.tar.gz
updated withlibslapt make target
-rw-r--r--ChangeLog3
-rw-r--r--Makefile19
2 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 6759d93..b246dd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-0.9.9j Mar 28, 2005
+0.9.9j Apr 01, 2005
+ * updated withlibslapt make target
* added generate_suggestions() so that suggestions are properly detected
after transaction has been created instead of checking multiple times
if possible suggestions are present in the current transaction
diff --git a/Makefile b/Makefile
index 09c2ecc..56238f8 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,8 @@ $(OBJS):
$(PROGRAM_NAME): libs
$(CC) -o $(PROGRAM_NAME) $(OBJS) $(CFLAGS) $(CURLFLAGS)
-#test with LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./src ./slapt-get
withlibslapt: libs
- $(CC) -o $(PROGRAM_NAME) $(NONLIBOBJS) $(CFLAGS) $(CURLFLAGS) -L./src -lslapt-$(VERSION)
+ $(CC) -o $(PROGRAM_NAME) $(NONLIBOBJS) $(CFLAGS) $(CURLFLAGS) -lslapt-$(VERSION)
static: libs
$(CC) -o $(PROGRAM_NAME) $(OBJS) $(CFLAGS) $(CURLFLAGS) -static
@@ -36,7 +35,15 @@ staticinstall: static doinstall
withlibslaptinstall: withlibslapt doinstall
-doinstall:
+libsinstall: libs
+ cp include/slapt.h /usr/include/
+ cp src/libslapt-$(VERSION).a src/libslapt-$(VERSION).so /usr/lib/
+ if [ -L /usr/lib/libslapt.so ]; then rm /usr/lib/libslapt.so;fi
+ ln -s /usr/lib/libslapt-$(VERSION).so /usr/lib/libslapt.so
+ if [ -L /usr/lib/libslapt.a ]; then rm /usr/lib/libslapt.a;fi
+ ln -s /usr/lib/libslapt-$(VERSION).a /usr/lib/libslapt.a
+
+doinstall: libsinstall
strip --strip-unneeded $(PROGRAM_NAME)
install $(PROGRAM_NAME) $(SBINDIR)
chown root:bin $(SBINDIR)$(PROGRAM_NAME)
@@ -49,12 +56,6 @@ doinstall:
for i in `ls po/ --ignore=slapt-get.pot --ignore=CVS |sed 's/.po//'` ;do if [ ! -d $(LOCALESDIR)/$$i/LC_MESSAGES ]; then mkdir -p $(LOCALESDIR)/$$i/LC_MESSAGES; fi; msgfmt -o $(LOCALESDIR)/$$i/LC_MESSAGES/slapt-get.mo po/$$i.po;done
mkdir -p /usr/doc/$(PROGRAM_NAME)-$(VERSION)/
cp example.slapt-getrc COPYING Changelog INSTALL README FAQ FAQ.html TODO /usr/doc/$(PROGRAM_NAME)-$(VERSION)/
- cp include/slapt.h /usr/include/
- cp src/libslapt-$(VERSION).a src/libslapt-$(VERSION).so /usr/lib/
- if [ -L /usr/lib/libslapt.so ]; then rm /usr/lib/libslapt.so;fi
- ln -s /usr/lib/libslapt-$(VERSION).so /usr/lib/libslapt.so
- if [ -L /usr/lib/libslapt.a ]; then rm /usr/lib/libslapt.a;fi
- ln -s /usr/lib/libslapt-$(VERSION).a /usr/lib/libslapt.a
uninstall:
-rm /$(SBINDIR)/$(PROGRAM_NAME)