[Gsrc-commit] trunk r3076: more tweaks to ncurses recipe

[Brandon Invergo]

------------------------------------------------------------
revno: 3076
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2014-09-17 21:59:18 +0100
message:
  more tweaks to ncurses recipe
modified:
  gnu/ncurses/Makefile           makefile-20100606211655-sj1nx80alech6rtq-58

=== modified file 'gnu/ncurses/Makefile'
--- a/gnu/ncurses/Makefile      2014-09-16 20:38:27 +0000
+++ b/gnu/ncurses/Makefile      2014-09-17 20:59:18 +0000
@@ -35,9 +35,9 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-CONFIGURE_SCRIPTS = ncurses ncursesw
-BUILD_SCRIPTS = ncurses ncursesw
-INSTALL_SCRIPTS = ncurses ncursesw
+CONFIGURE_SCRIPTS = ncursesw ncurses
+BUILD_SCRIPTS = $(WORKDIR)/ncursesw-build/Makefile 
$(WORKDIR)/ncurses-build/Makefile
+INSTALL_SCRIPTS = $(WORKDIR)/ncursesw-build/Makefile ncursesw ncurses
 
 
 BUILDDEPS = libtool
@@ -65,19 +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 
--with-pkg-config=$(prefix)/lib/pkgconfig $(OUTPUT)
-       $(MAKECOOKIE)
-
-build-ncurses:
-       @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*\n"
-       $(BUILD_ENV) $(MAKE) -C $(WORKDIR)/ncurses-build $(MAKE_ARGS) 
$(BUILD_ARGS) \
-               $(OUTPUT) || $(BUILD_FAIL)
-       $(MAKECOOKIE)
-
-build-ncursesw:
-       @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*\n"
-       $(BUILD_ENV) $(MAKE) -C $(WORKDIR)/ncursesw-build $(MAKE_ARGS) 
$(BUILD_ARGS) \
-               $(OUTPUT) || $(BUILD_FAIL)
+               $(CONFIGURE_ARGS) --enable-widec --enable-pc-files 
--with-pkg-config=$(packageprefix)/lib/pkgconfig $(OUTPUT)
        $(MAKECOOKIE)
 
 pre-install:
@@ -85,7 +73,7 @@
        $(MAKECOOKIE)
 
 install-ncurses:
-       @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in 
$(OFF)$*\n"
+       @printf "[$(OK)install$(OFF)] $(MSG)Installing ncurses libraries 
$(OFF)\n"
        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; \
@@ -93,9 +81,7 @@
        $(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)
+       @printf "[$(OK)install$(OFF)] $(MSG)Installing ncursesw libraries 
$(OFF)\n"
        for lib in ncurses form panel menu; do \
                echo "INPUT(-l$${lib}w)" >$(packageprefix)/lib/lib$${lib}.so; \
        done