diff options
| author | Peter Jones <pjones@redhat.com> | 2006-03-24 15:38:51 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2006-03-24 15:38:51 +0000 |
| commit | 72eb48a7e39830dd47ce5b4a83ce840d24a26854 (patch) | |
| tree | d7a0ce65f788f4816eecdeb9b6d7680f6bc24732 | |
| parent | cc285e06f07d1bf4a6793cd9950c2aa05fb966cd (diff) | |
| download | anaconda-72eb48a7e39830dd47ce5b4a83ce840d24a26854.tar.gz anaconda-72eb48a7e39830dd47ce5b4a83ce840d24a26854.tar.xz anaconda-72eb48a7e39830dd47ce5b4a83ce840d24a26854.zip | |
- Fix SELinux conditional inclusion/build
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.inc | 7 | ||||
| -rw-r--r-- | isys/Makefile | 5 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2006-03-24 Peter Jones <pjones@redhat.com> + + * Makefile.inc: Fix selinux conditional inclusion. + * isys/Makefile: ditto + 2006-03-23 Chris Lumens <clumens@redhat.com> * anaconda: Remove customClass. diff --git a/Makefile.inc b/Makefile.inc index 1e0c0ee9f..046026297 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -26,8 +26,13 @@ endif USESELINUX=1 +ifeq ($(USESELINUX),1) +SELINUXLIBES = -lselinux -lsepol +SELINUXFLAGS = -DUSESELINUX=1 +endif + ifndef RPM_OPT_FLAGS RPM_OPT_FLAGS = -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions endif -CFLAGS = $(RPM_OPT_FLAGS) -Wall -Werror -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 +CFLAGS = $(RPM_OPT_FLAGS) -Wall -Werror -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 $(SELINUXFLAGS) diff --git a/isys/Makefile b/isys/Makefile index 26581fa6f..84f743fbe 100644 --- a/isys/Makefile +++ b/isys/Makefile @@ -9,10 +9,7 @@ OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o getmacaddr.o \ SOBJECTS = $(patsubst %.o,%.lo,$(OBJECTS)) SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) isys.c LOADLIBES = -lresolv -lpci -lpopt -lpump -lext2fs -lz -lkudzu -lpci -ldevmapper -ifeq ($(USESELINUX),1) -LOADLIBES += -lselinux -lsepol -SELINUXFLAGS = -DUSESELINUX=1 -endif +LOADLIBES += $(SELINUXLIBES) PYMODULES = _isys.so SUBDIRS = gzlib DIET = diet |