diff -u -r dev_allocator/classes/Makefile dev_allocator.good/classes/Makefile
--- dev_allocator/classes/Makefile 2006-01-31 13:09:06.000000000 -0500
+++ dev_allocator.good/classes/Makefile 2006-06-20 22:36:21.000000000 -0400
@@ -1,8 +1,8 @@
# If ROOT was not defined on the command-line, then define it now:
ROOT ?= $(shell pwd)/../root
export ROOT
-
-LIBDIR = $(ROOT)/usr/lib/devallocation
+LIBDIR ?= $(ROOT)/usr/lib
+DEVLIBDIR = $(LIBDIR)/devallocation
LIBMAJORVERSION = 0
LIBMINORVERSION = 2
@@ -55,12 +55,12 @@
$(CC) $(CFLAGS) -fPIC -c -o $@ $<
install: all
- test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
- install -m 755 $(LIBCDROMV) $(LIBDIR)
- install -m 755 $(LIBFDV) $(LIBDIR)
- install -m 755 $(LIBSNDV) $(LIBDIR)
- install -m 755 $(LIBGENERICV) $(LIBDIR)
- install -m 755 $(LIBNOACTIONV) $(LIBDIR)
+ test -d $(DEVLIBDIR) || install -m 755 -d $(DEVLIBDIR)
+ install -m 755 $(LIBCDROMV) $(DEVLIBDIR)
+ install -m 755 $(LIBFDV) $(DEVLIBDIR)
+ install -m 755 $(LIBSNDV) $(DEVLIBDIR)
+ install -m 755 $(LIBGENERICV) $(DEVLIBDIR)
+ install -m 755 $(LIBNOACTIONV) $(DEVLIBDIR)
clean:
rm -f *.o lib*.so*
diff -u -r dev_allocator/lib/Makefile dev_allocator.good/lib/Makefile
--- dev_allocator/lib/Makefile 2006-02-13 18:44:38.000000000 -0500
+++ dev_allocator.good/lib/Makefile 2006-06-20 22:36:21.000000000 -0400
@@ -1,6 +1,7 @@
# If ROOT was not defined on the command-line, then define it now:
ROOT ?= $(shell pwd)/../root
export ROOT
+LIBDIR ?= $(ROOT)/usr/lib
# This version number should match the one in the RPM spec file
# This is the major version number
@@ -41,15 +42,14 @@
$(CC) $(CFLAGS) -fPIC -c -o $@ $<
install: all
- mkdir -p ${ROOT}/lib
- mkdir -p ${ROOT}/usr/lib
+ mkdir -p ${LIBDIR}
mkdir -p ${ROOT}/usr/include
mkdir -p ${ROOT}/usr/include/selinux
mkdir -p ${ROOT}/etc/selinux/mls
- cp -f $(LIBV) ${ROOT}/usr/lib
- cp -fd $(LIBM) ${ROOT}/usr/lib
- cd $(ROOT)/usr/lib && ln -sf $(LIBV) $(TARGET)
- cp -f $(LIBA) ${ROOT}/usr/lib
+ cp -f $(LIBV) ${LIBDIR}
+ cp -fd $(LIBM) ${LIBDIR}
+ cd ${LIBDIR} && ln -sf $(LIBV) $(TARGET)
+ cp -f $(LIBA) ${LIBDIR}
cp -f $(HEADERS) $(ROOT)/usr/include/selinux/
clean:
--
redhat-lspp mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/redhat-lspp
