summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorjbj <devnull@localhost>1998-08-11 18:24:48 +0000
committerjbj <devnull@localhost>1998-08-11 18:24:48 +0000
commitf612cb1bf38b0179bff78ed1b9303af287745ca3 (patch)
treefa252385d05526ee272fc7a3b57419d1934ee31c /Makefile.in
parent8ff713d13030f2f598e33535366f785047bd50e4 (diff)
downloadrpm-f612cb1bf38b0179bff78ed1b9303af287745ca3.tar.gz
rpm-f612cb1bf38b0179bff78ed1b9303af287745ca3.tar.bz2
rpm-f612cb1bf38b0179bff78ed1b9303af287745ca3.zip
Sync with 2.5.2 branch patches.
cpio_gzip: dup the fd before doing gzdopen (Thanks Erik!) add --noLang to skip non-default languages. CVS patchset: 2243 CVS date: 1998/08/11 18:24:48
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 41f7dbb47..42795af17 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ ETCDIR=$(ROOT)/etc
SUBDIRS = popt @MISCDIR@ lib build tools @PO@
ALLSUBDIRS = popt misc lib build tools po
-INSTSUBDIRS = lib @PO@
+INSTSUBDIRS = lib scripts @PO@
OTHERSUBDIRS = docs autodeps
OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o build.o \
@GETTEXTSTUB@
@@ -73,6 +73,7 @@ rpm.o: rpm.c query.h install.h lib/rpmlib.h Makefile
-DRPMNLSDIR=\"$(RPMNLSDIR)\" \
-DVERSION=\"$(VERSION)\" \
-DLIBRPMALIAS_FILENAME="\"$(LIBRPMALIAS_FILENAME)"\" \
+ -DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
-c $(srcdir)/rpm.c
# these rules should be in here, but they drive me batty
@@ -180,11 +181,13 @@ distclean:
.PHONY: depend
depend:
topdir_path=`( cd $(top_srcdir) && pwd )` ; \
+ /bin/rm -f .depend ; \
$(CPP) -MM $(CFLAGS) $(srcdir)/$(SOURCES) | \
sed s+$$topdir_path+$(top_srcdir)+g > .depend ; \
for d in $(ALLSUBDIRS); do \
(cd $$d; $(MAKE) $@) ;\
done
+ /bin/rm -f .depend-done
echo > .depend-done
.PHONY: noconfig