moved rpm to /bin

CVS patchset: 372
CVS date: 1996/02/20 23:55:15

diff --git a/Makefile.in b/Makefile.in
index 48cc664..4bc3e5f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,9 +11,10 @@ RANLIB = ranlib
 
 VERSION=2.0e
 
-prefix=/usr
+prefix=$(ROOT)/usr
 
 BINDIR=$(prefix)/bin
+RPMBINDIR=$(subst usr/bin,bin,$(BINDIR))
 MANDIR=$(prefix)/man/man8
 LIBDIR=$(prefix)/lib
 INCDIR=$(prefix)/include/rpm
@@ -37,6 +38,8 @@ endif
 all: $(TARGET)
 
 rpm: lib/librpm.a build/libbuild.a rpm.o
+       $(CC) -o rpm -static $(LDFLAGS) rpm.o $(OBJS) $(LOADLIBES)
+       $(CC) -o rpm.shared $(LDFLAGS) rpm.o $(OBJS) $(LOADLIBES)
 
 rpm.o: rpm.c query.h install.h lib/rpmlib.h Makefile
        $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c rpm.c
@@ -54,9 +57,10 @@ make-subdirs:
 $(PROGS): $(OBJS)
 
 install:
+       install -m 755 -o 0 -g 0 -d $(RPMBINDIR)
        install -m 755 -o 0 -g 0 -d $(BINDIR)
        install -m 755 -o 0 -g 0 -d $(MANDIR)
-       install -s -m 755 -o 0 -g 0 rpm $(BINDIR)
+       install -s -m 755 -o 0 -g 0 rpm $(RPMBINDIR)
        install -s -m 755 -o 0 -g 0 rpmconvert $(BINDIR)
        install -m 644 -o 0 -g 0 rpm.8 $(MANDIR)
        (cd lib; make LIBDIR=$(LIBDIR) INCDIR=$(INCDIR) install)