Mercurial > mxe-octave

changeset 2857:94c2c61023a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Install pdcurses library as libcurses. Simplify readline .mk file.
author John W. Eaton <jwe@octave.org>
date Fri, 16 Nov 2012 11:17:52 -0500
parents 4d32dc6aca86
children 7c6b29399d05
files src/pdcurses.mk src/readline.mk
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/pdcurses.mk	Thu Nov 15 16:02:40 2012 -0500
+++ b/src/pdcurses.mk	Fri Nov 16 11:17:52 2012 -0500
@@ -24,10 +24,11 @@
         PDCURSES_SRCDIR=. \
         WIDE=Y \
         UTF8=Y
-    $(TARGET)-ranlib '$(1)/pdcurses.a' '$(1)/panel.a'
+    mv '$(1)/pdcurses.a' '$(1)/libcurses.a'
+    $(TARGET)-ranlib '$(1)/libcurses.a' '$(1)/panel.a'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/'
     $(INSTALL) -m644 '$(1)/curses.h' '$(1)/panel.h' '$(1)/term.h' '$(PREFIX)/$(TARGET)/include/'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/'
-    $(INSTALL) -m644 '$(1)/pdcurses.a' '$(PREFIX)/$(TARGET)/lib/libpdcurses.a'
+    $(INSTALL) -m644 '$(1)/libcurses.a' '$(PREFIX)/$(TARGET)/lib/libcurses.a'
     $(INSTALL) -m644 '$(1)/panel.a'    '$(PREFIX)/$(TARGET)/lib/libpanel.a'
 endef
--- a/src/readline.mk	Thu Nov 15 16:02:40 2012 -0500
+++ b/src/readline.mk	Fri Nov 16 11:17:52 2012 -0500
@@ -25,7 +25,6 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-multibyte \
         --without-purify \
-        --with-curses \
-        LIBS='-lpdcurses'
+        --with-curses
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef