From 9764ac9511f96c57b46d224b8f4b30a8d8896a4a Mon Sep 17 00:00:00 2001 From: ewt Date: Tue, 15 Oct 1996 02:12:51 +0000 Subject: [PATCH] 1) cleaned up conditional gettext support 2) removed ; which broke install rule CVS patchset: 1084 CVS date: 1996/10/15 02:12:51 --- Makefile.in | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index a02f5fd..0885f03 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,12 +45,12 @@ endif all: $(TARGET) -rpm: lib/librpm.a build/libbuild.a @GETTEXTSTUB@ $(OBJS) - $(CC) -o rpm -static $(LDFLAGS) @GETTEXTSTUB@ $(OBJS) $(LOADLIBES) \ +rpm: lib/librpm.a build/libbuild.a $(OBJS) + $(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) \ $(LIBEFENCE) -rpm.shared: lib/librpm.a build/libbuild.a @GETTEXTSTUB@ $(OBJS) - $(CC) -o rpm.shared $(LDFLAGS) @GETTEXTSTUB@ $(OBJS) $(LOADLIBES) \ +rpm.shared: lib/librpm.a build/libbuild.a $(OBJS) + $(CC) -o rpm.shared $(LDFLAGS) $(OBJS) $(LOADLIBES) \ $(LIBEFENCE) rpm2cpio: lib/librpm.a rpm2cpio.o @@ -96,7 +96,12 @@ install: all $(INSTALL) -m 755 -o 0 -g 0 -d $(installprefix)/$(MANDIR) $(INSTALL) -m 755 -o 0 -g 0 -d $(installprefix)/$(ETCDIR) $(INSTALL) -m 755 -o 0 -g 0 -d $(installprefix)/$(LIBDIR) - $(INSTALL) -s -m 755 -o 0 -g 0 rpm $(installprefix)/$(RPMBINDIR) + if [ -f rpm ]; then \ + $(INSTALL) -s -m 755 -o 0 -g 0 rpm $(installprefix)/$(RPMBINDIR); \ + else \ + $(INSTALL) -s -m 755 -o 0 -g 0 rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \ + fi + $(INSTALL) -m 755 -o 0 -g 0 $(srcdir)/gendiff $(installprefix)/$(BINDIR) $(INSTALL) -m 755 -o 0 -g 0 $(srcdir)/find-provides $(installprefix)/$(BINDIR) $(INSTALL) -s -m 755 -o 0 -g 0 rpm2cpio $(installprefix)/$(BINDIR) -- 2.7.4