Changeset 7420787817c4949276d7947202b49d78eba37c13

Show
Ignore:
Timestamp:
03/06/10 17:06:43 (5 months ago)
Author:
Joshua Brindle <method@manicmethod.com>
Committer:
Joshua Brindle <method@manicmethod.com> 1267916803 -0500
Parent:

[d03b94113615c1751b8a074bbd4064d915c70ff9]

Message:

updated libselinux pkgconfig does not work correctly on lib64 machines.

On 02/24/2010 02:24 PM, Daniel J Walsh wrote:


Ignore the first patch it was missing pc.in files.

Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Joshua Brindle <method@manicmethod.com>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • libselinux/src/Makefile

    ra69fb97 r7420787  
    1212RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) 
    1313RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) 
     14LIBBASE=$(shell basename $(LIBDIR)) 
    1415 
    1516VERSION = $(shell cat ../VERSION) 
    …… 
    8687 
    8788$(LIBPC): $(LIBPC).in 
    88         sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ 
     89        sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ 
    8990 
    9091selinuxswig_python_exception.i: ../include/selinux/selinux.h 

  • libselinux/src/libselinux.pc.in

    r1277750 r7420787  
    11prefix=@prefix@ 
    22exec_prefix=${prefix} 
    3 libdir=${exec_prefix}/lib 
     3libdir=${exec_prefix}/@libdir@ 
    44includedir=@includedir@ 
    55 

  • libsemanage/src/Makefile

    r55648cc r7420787  
    1111RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) 
    1212RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) 
     13LIBBASE=$(shell basename $(LIBDIR)) 
    1314 
    1415DEFAULT_SEMANAGE_CONF_LOCATION=$(DESTDIR)/etc/selinux/semanage.conf 
    …… 
    8384 
    8485$(LIBPC): $(LIBPC).in 
    85         sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ 
     86        sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ 
    8687 
    8788conf-scan.c: conf-scan.l conf-parse.h 

  • libsemanage/src/libsemanage.pc.in

    r1277750 r7420787  
    11prefix=@prefix@ 
    22exec_prefix=${prefix} 
    3 libdir=${exec_prefix}/lib 
     3libdir=${exec_prefix}/@libdir@ 
    44includedir=@includedir@ 
    55 

  • libsepol/src/Makefile

    r1277750 r7420787  
    44LIBDIR ?= $(PREFIX)/lib 
    55SHLIBDIR ?= $(DESTDIR)/lib 
     6LIBBASE=$(shell basename $(LIBDIR)) 
    67 
    78VERSION = $(shell cat ../VERSION) 
    …… 
    2829 
    2930$(LIBPC): $(LIBPC).in 
    30         sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ 
     31        sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ 
    3132 
    3233%.o:  %.c  

  • libsepol/src/libsepol.pc.in

    r1277750 r7420787  
    11prefix=@prefix@ 
    22exec_prefix=${prefix} 
    3 libdir=${exec_prefix}/lib 
     3libdir=${exec_prefix}/@libdir@ 
    44includedir=@includedir@ 
    55