summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>1999-11-12 21:35:25 +0000
committerMike Fulbright <msf@redhat.com>1999-11-12 21:35:25 +0000
commit288529a31576468d7d27ca1e9aec8a63ac973510 (patch)
treeaab56db9f4f406e2a7a6b321bed746a7ed09c9fc /isys
parent3230f88eef53294ac71019f620c998e98b62af77 (diff)
downloadanaconda-288529a31576468d7d27ca1e9aec8a63ac973510.tar.gz
anaconda-288529a31576468d7d27ca1e9aec8a63ac973510.tar.xz
anaconda-288529a31576468d7d27ca1e9aec8a63ac973510.zip
Several changes to build structure - contact Dr Mike if you hit problems.
I've made most of the Makefile's use the Makefile.inc include in the root of the anaconda src tree to get the python path, instead of having it defined in many different places. In the top level Makefile I added a install target called install-unconfig. This target installs the anaconda script and associated support files with the intention of being able to run anaconda in unconfig mode after a successful install. This mode is automatically selected if the executed script is called 'anaconda-unconfig', or the '-U' command line parameter is used.
Diffstat (limited to 'isys')
-rw-r--r--isys/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/isys/Makefile b/isys/Makefile
index cc5ef20fc..5f042e567 100644
--- a/isys/Makefile
+++ b/isys/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.inc
+
ARCH := $(patsubst i%86,i386,$(shell uname -m))
ARCH := $(patsubst sparc%,sparc,$(ARCH))
CFLAGS = -I/usr/include/python1.5 -I.. -g
@@ -7,7 +9,7 @@ STATICOBJS = otherinsmod.o
STATICLIBS = ../kudzu/kudzumodule.so
LOADLIBES = -lrpm -lbz2 -lresolv -lz -lpci -lpopt
SUBDIRS = modutils pci
-PYTHONLIBDIR = $(DESTDIR)/usr/lib/python1.5/site-packages
+#PYTHONLIBDIR = $(DESTDIR)/Pusr/lib/python1.5/site-packages
PYMODULES = _isys.so
ifeq ($(ARCH),sparc)
@@ -29,7 +31,7 @@ clean:
for d in $(SUBDIRS); do make TOPDIR=../$(TOPDIR) -C $$d clean; done
install: all
- cp $(PYMODULES) isys.py $(PYTHONLIBDIR)
+ cp $(PYMODULES) isys.py $(DESTDIR)/$(PYTHONLIBDIR)
subdirs:
for d in $(SUBDIRS); do make TOPDIR=../$(TOPDIR) -C $$d; done