diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-1.27.22/src/Makefile --- nsalibselinux/src/Makefile 2005-11-28 21:47:32.000000000 -0500 +++ libselinux-1.27.22/src/Makefile 2005-11-28 16:57:58.000000000 -0500 @@ -3,10 +3,10 @@ LIBDIR ?= $(PREFIX)/lib SHLIBDIR ?= $(DESTDIR)/lib INCLUDEDIR ?= $(PREFIX)/include -PYINC ?= /usr/include/python2.4 -PYLIB ?= /usr/lib/python2.4 PYLIBVER ?= python2.4 -PYTHONLIBDIR ?= $(LIBDIR)/python2.4 +PYINC ?= /usr/include/$(PYLIBVER) +PYLIB ?= /usr/lib/$(PYLIBVER) +PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) LIBVERSION = 1 @@ -36,7 +36,7 @@ $(CC) $(CFLAGS) -I$(PYINC) -fpic -DSHARED -c -o $@ $< $(SWIGSO): $(SWIGLOBJ) - $(CC) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -l$(PYLIBVER) -L$(LIBDIR) -Wl,-soname,$@,-z,defs + $(CC) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ $(LIBSO): $(LOBJS) $(CC) $(LDFLAGS) -shared -o $@ $^ -ldl -lsepol -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs