summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2001-10-16 20:59:15 +0000
committerMatt Wilson <msw@redhat.com>2001-10-16 20:59:15 +0000
commitcc02a97cc308be0ae7d6e4ac6c605518103c6f22 (patch)
tree21376b7119090a57bc496a2731b7952fd465b0a9 /Makefile
parent584b653db54b96a7721cffeba67680495e59337c (diff)
downloadanaconda-cc02a97cc308be0ae7d6e4ac6c605518103c6f22.tar.gz
anaconda-cc02a97cc308be0ae7d6e4ac6c605518103c6f22.tar.xz
anaconda-cc02a97cc308be0ae7d6e4ac6c605518103c6f22.zip
merge anaconda-gtk-2-0-branch to HEAD
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2ab1868eb..b2ebc24e8 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ endif
SUBDIRSHD = balkan isys collage $(MINISLANG) loader po text-help \
textw utils scripts bootdisk installclasses \
- keymaps fonts gnome-map iw help pixmaps $(STUBS)
+ keymaps fonts gnome-map iw help pixmaps $(STUBS) iconvmodule
SUBDIRS = $(SUBDIRSHD)
ifeq (i386, $(ARCH))
@@ -28,11 +28,11 @@ PYFILES = $(wildcard *.py)
all: subdirs _xkb.so xmouse.so $(CATALOGS) lang-table
_xkb.so: xkb.c
- gcc -Wall -o _xkb.o -O2 -fPIC -I/usr/include/python1.5 `gtk-config --cflags gtk` -c xkb.c
+ gcc -Wall -o _xkb.o -O2 -fPIC -I$(PYTHONINCLUDE) `gtk-config --cflags gtk` -c xkb.c
gcc -o _xkb.so -shared _xkb.o /usr/X11R6/lib/libxkbfile.a `gtk-config --libs gtk`
xmouse.so: xmouse.c
- gcc -Wall -o xmouse.o -fPIC -I/usr/X11R6/include -I/usr/include/python1.5 -I /usr/include/python1.5 -c xmouse.c
+ gcc -Wall -o xmouse.o -fPIC -I/usr/X11R6/include -I$(PYTHONINCLUDE) -I $(PYTHONINCLUDE) -c xmouse.c
gcc -o xmouse.so -shared xmouse.o /usr/X11R6/lib/libXxf86misc.a -L/usr/X11R6/lib -lX11 -lXext
depend: