[Gsrc-commit] trunk r3075: more work on ncurses pkg-config stuff

[Brandon Invergo]

------------------------------------------------------------
revno: 3075
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2014-09-16 21:38:27 +0100
message:
  more work on ncurses pkg-config stuff
modified:
  gnu/ncurses/Makefile           makefile-20100606211655-sj1nx80alech6rtq-58

=== modified file 'gnu/ncurses/Makefile'
--- a/gnu/ncurses/Makefile      2014-09-15 21:56:04 +0000
+++ b/gnu/ncurses/Makefile      2014-09-16 20:38:27 +0000
@@ -65,7 +65,7 @@
        @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in 
$(OFF)$*\n"
        mkdir $(WORKDIR)/ncursesw-build
        cd $(WORKDIR)/ncursesw-build && $(CONFIGURE_ENV) 
../$(DISTNAME)/configure \
-               $(CONFIGURE_ARGS) --enable-widec --enable-pc-files $(OUTPUT)
+               $(CONFIGURE_ARGS) --enable-widec --enable-pc-files 
--with-pkg-config=$(prefix)/lib/pkgconfig $(OUTPUT)
        $(MAKECOOKIE)
 
 build-ncurses:
@@ -80,6 +80,10 @@
                $(OUTPUT) || $(BUILD_FAIL)
        $(MAKECOOKIE)
 
+pre-install:
+       mkdir -p $(packageprefix)/lib/pkgconfig
+       $(MAKECOOKIE)
+
 install-ncurses:
        @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in 
$(OFF)$*\n"
        for lib in ncurses form panel menu; do \
@@ -95,6 +99,9 @@
        for lib in ncurses form panel menu; do \
                echo "INPUT(-l$${lib}w)" >$(packageprefix)/lib/lib$${lib}.so; \
        done
+       for lib in ncurses ncurses++ form panel menu; do \
+               ln -s $(prefix)/lib/pkgconfig/$${lib}w.pc 
$(packageprefix)/lib/pkgconfig/$${lib}.pc; \
+       done
        echo "INPUT(-lncursesw)" >$(packageprefix)/lib/libcursesw.so
        ln -s $(prefix)/lib/libncurses.so $(packageprefix)/lib/libcurses.so
        $(MAKECOOKIE)