summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>1999-05-03 21:14:31 +0000
committerMatt Wilson <msw@redhat.com>1999-05-03 21:14:31 +0000
commit0326f77c860cf57068cde4ad365451e7adbef268 (patch)
treecfbe72e33a557626eb3bc4089d3d531c6e5fc9c1
parent663a64b69379647e24bd23faf3bed61d683b4133 (diff)
downloadanaconda-0326f77c860cf57068cde4ad365451e7adbef268.tar.gz
anaconda-0326f77c860cf57068cde4ad365451e7adbef268.tar.xz
anaconda-0326f77c860cf57068cde4ad365451e7adbef268.zip
added install target
-rw-r--r--Makefile6
-rw-r--r--balkan/Makefile4
-rw-r--r--isys/Makefile8
-rw-r--r--rpmmodule/Makefile4
4 files changed, 18 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index f9c02f4c7..e9b611f27 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
SUBDIRS = rpmmodule isys balkan loader
-
-DESTDIR = ../../../RedHat/instimage/usr/bin
+TOPDIR = ../../..
+DESTDIR = $TOPDIR/RedHat/instimage/usr/bin
all: subdirs
@@ -12,7 +12,7 @@ clean:
subdirs:
for d in $(SUBDIRS); do \
- (cd $$d; $(MAKE)) \
+ (cd $$d; $(MAKE) TOPDIR=../$(TOPDIR)) \
|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac;\
done && test -z "$$fail"
diff --git a/balkan/Makefile b/balkan/Makefile
index 37f85a592..23a12f5b7 100644
--- a/balkan/Makefile
+++ b/balkan/Makefile
@@ -1,3 +1,4 @@
+DESTDIR = $TOPDIR/RedHat/instimage/usr/lib/python1.5/site-packages
OBJECTS = rw.o dos.o
@@ -17,3 +18,6 @@ clean:
rm -f *.o $(TARGET)
dos.o: dos.h
+
+install: all
+ cp _balkanmodule.so $(DESTDIR)
diff --git a/isys/Makefile b/isys/Makefile
index 91c419174..b9c073f72 100644
--- a/isys/Makefile
+++ b/isys/Makefile
@@ -1,12 +1,18 @@
+DESTDIR = $TOPDIR/RedHat/instimage/usr/lib/python1.5/site-packages
CFLAGS = -I/usr/include/python1.5
OBJECTS = isys.o nfsmount.o dns.o mount_clnt.o mount_xdr.o imount.o
LOADLIBES = -lresolv
-all: _isys.so
+all: _isys.so isys.a
_isys.so: $(OBJECTS)
gcc -shared -o $@ $(OBJECTS) $(LOADLIBES)
+isys.a: isys.a($(OBJECTS))
+
clean:
rm -f *.o $(TARGET) $(OBJECTS)
+
+install: all
+ cp _isys.so isys.py $(DESTDIR)
diff --git a/rpmmodule/Makefile b/rpmmodule/Makefile
index 989681ff8..50c4c0957 100644
--- a/rpmmodule/Makefile
+++ b/rpmmodule/Makefile
@@ -1,3 +1,4 @@
+DESTDIR = $TOPDIR/RedHat/instimage/usr/lib/python1.5/site-packages
CFLAGS += -I/usr/include/rpm -I/usr/include/python1.5 -g
@@ -10,3 +11,6 @@ rpmmodule.so: rpmmodule.o
clean:
rm -f *.o $(TARGET)
+
+install: all
+ cp $(TARGET) $(DESTDIR)