# HG changeset patch # User John W. Eaton # Date 1353082672 18000 # Node ID 94c2c61023a00a305ddbe669ff86a968bdbb8493 # Parent 4d32dc6aca864f6a8ece36783cfb87e3777a121e Install pdcurses library as libcurses. Simplify readline .mk file. diff -r 4d32dc6aca86 -r 94c2c61023a0 src/pdcurses.mk --- 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 diff -r 4d32dc6aca86 -r 94c2c61023a0 src/readline.mk --- 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