[Gsrc-commit] trunk r3073: clean up ncurses installation

[Brandon Invergo]

------------------------------------------------------------
revno: 3073
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2014-09-15 22:56:04 +0100
message:
  clean up ncurses installation
modified:
  gnu/ncurses/Makefile           makefile-20100606211655-sj1nx80alech6rtq-58

=== modified file 'gnu/ncurses/Makefile'
--- a/gnu/ncurses/Makefile      2014-02-02 16:06:37 +0000
+++ b/gnu/ncurses/Makefile      2014-09-15 21:56:04 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -48,8 +48,7 @@
 include ../../gar.lib/auto.mk
 include config.mk
 
-CONFIGURE_ARGS += --with-shared --with-normal --without-debug \
-       --with-pkg-config=$(packageprefix)/lib/pkgconfig
+CONFIGURE_ARGS += --with-shared --with-normal --without-debug
 ifeq ($(GARARCH),x86_64)
        ARCH_ARG = --with-chtype=long
 else
@@ -83,28 +82,19 @@
 
 install-ncurses:
        @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in 
$(OFF)$*\n"
-       cd $(WORKDIR)/ncurses-build && for lib in ncurses form panel menu; do \
-               install -Dm755 lib/lib$${lib}.so.$(GARVERSION) \
-                       $(packageprefix)/lib/lib$${lib}.so.$(GARVERSION); \
-               ln -s lib$${lib}.so.$(GARVERSION) 
$(packageprefix)/lib/lib$${lib}.so.5; \
+       for lib in ncurses form panel menu; do \
+               $(INSTALL_LIB) 
$(WORKDIR)/ncurses-build/lib/lib$${lib}.so.$(GARVERSION); \
+               ln -s $(prefix)/lib/lib$${lib}.so.$(GARVERSION) 
$(packageprefix)/lib/lib$${lib}.so.5; \
        done
        $(MAKECOOKIE)
 
-pre-install:
-       mkdir -p $(packageprefix)/lib/pkgconfig
-       $(MAKECOOKIE)
-
 install-ncursesw:
        @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in 
$(OFF)$*\n"
        $(INSTALL_ENV) $(MAKE) -C $(WORKDIR)/ncursesw-build $(MAKE_ARGS) \
                $(INSTALL_ARGS) install $(OUTPUT)
-       cd $(WORKDIR)/ncursesw-build && for lib in ncurses form panel menu; do \
+       for lib in ncurses form panel menu; do \
                echo "INPUT(-l$${lib}w)" >$(packageprefix)/lib/lib$${lib}.so; \
        done
-       cd $(WORKDIR)/ncursesw-build && for lib in ncurses ncurses++ fom panel 
menu; do \
-               ln -s $${lib}w.pc $(packageprefix)/lib/pkgconfig/$${lib}.pc; \
-       done
-       cd $(WORKDIR)/ncursesw-build && echo "INPUT(-lncursesw)" \
-               >$(packageprefix)/lib/libcursesw.so
-       ln -s $(WORKDIR)/ncursesw-build/libncurses.so 
$(packageprefix)/lib/libcurses.so
+       echo "INPUT(-lncursesw)" >$(packageprefix)/lib/libcursesw.so
+       ln -s $(prefix)/lib/libncurses.so $(packageprefix)/lib/libcurses.so
        $(MAKECOOKIE)