summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>1999-08-29 20:42:28 +0000
committerMatt Wilson <msw@redhat.com>1999-08-29 20:42:28 +0000
commitda6be813f4b346762e125fa466fbdcc30b8cb1cf (patch)
tree70f3386de1facd0e54d6485be8b83c08d595b225 /Makefile
parent9d5eecbb49a812efe1dcb034c42088f6bf8a3447 (diff)
downloadanaconda-da6be813f4b346762e125fa466fbdcc30b8cb1cf.tar.gz
anaconda-da6be813f4b346762e125fa466fbdcc30b8cb1cf.tar.xz
anaconda-da6be813f4b346762e125fa466fbdcc30b8cb1cf.zip
new iw makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 5 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 621df5795..319b0059e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
SUBDIRSHD = rpmmodule isys balkan libfdisk collage loader stubs po kudzu
-SUBDIRS = $(SUBDIRSHD) gnome-map
+SUBDIRS = $(SUBDIRSHD) gnome-map iw
BUILDONLYSUBDIRS = pump
TOPDIR = ../../..
@@ -7,7 +7,7 @@ DESTDIR = ../../../RedHat/instimage
CATALOGS = po/anaconda.pot
ALLSUBDIRS = $(BUILDONLYSUBDIRS) $(SUBDIRS)
-PYFILES = $(wildcard *.py) $(wildcard iw/*.py)
+PYFILES = $(wildcard *.py)
all: subdirs _xkb.so $(CATALOGS)
@@ -31,9 +31,7 @@ install-hd: all
mkdir -p $(DESTDIR)/usr/lib/python1.5/site-packages
cp -a anaconda $(DESTDIR)/usr/bin
cp -a *.py $(DESTDIR)/usr/lib/python1.5/site-packages
- mkdir -p $(DESTDIR)/usr/lib/python1.5/site-packages/iw
- cp -a iw/*.py $(DESTDIR)/usr/lib/python1.5/site-packages/iw
- cp -a *.py *.so $(DESTDIR)/usr/lib/python1.5/site-packages
+ cp -a *.so $(DESTDIR)/usr/lib/python1.5/site-packages
for d in $(SUBDIRSHD); do make TOPDIR=../$(TOPDIR) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; done
install: all
@@ -43,11 +41,8 @@ install: all
exit 1; \
fi
mkdir -p $(DESTDIR)/usr/bin
- mkdir -p $(DESTDIR)/usr/lib/python1.5/site-packages
- mkdir -p $(DESTDIR)/usr/bin/iw
cp -a anaconda $(DESTDIR)/usr/bin
- cp -a $(PYFILES) $(DESTDIR)/usr/lib/python1.5/site-packages
+ cp -var $(PYFILES) $(DESTDIR)/usr/lib/python1.5/site-packages
./py-compile --basedir $(DESTDIR)/usr/lib/python1.5/site-packages $(PYFILES)
- cp -a iw/*.py $(DESTDIR)/usr/bin/iw
- cp -a *.py *.so $(DESTDIR)/usr/lib/python1.5/site-packages
+ cp -a *.so $(DESTDIR)/usr/lib/python1.5/site-packages
for d in $(SUBDIRS); do make TOPDIR=../$(TOPDIR) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; done