diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-06-25 15:38:03 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-06-25 15:38:03 +0000 |
| commit | ab57732b2528f408e85bab03f278728a5490eff5 (patch) | |
| tree | f08deb432ffb5ad237e1485b5c88c4405f606232 | |
| parent | 187d5531b3b84cf78a6949ac8abbcd6904e1dfea (diff) | |
- correct installation path
| -rw-r--r-- | package/ncurses/ncurses.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 8692bc545..765d48afb 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -29,6 +29,10 @@ NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VER) NCURSES_SOURCE:=ncurses-$(NCURSES_VER).tar.gz NCURSES_CAT:=$(ZCAT) +ifneq ($(strip $(BR2_PACKAGE_NCURSES_TARGET_HEADERS)),y) +NCURSES_WANT_STATIC=--disable-static +endif + $(DL_DIR)/$(NCURSES_SOURCE): $(WGET) -P $(DL_DIR) $(NCURSES_SITE)/$(NCURSES_SOURCE) @@ -56,11 +60,11 @@ $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched --bindir=/usr/bin \ --sbindir=/usr/sbin \ --libdir=/lib \ - --libexecdir=/lib \ + --libexecdir=/usr/lib \ --sysconfdir=/etc \ --datadir=/usr/share \ --localstatedir=/var \ - --includedir=/include \ + --includedir=/usr/include \ --mandir=/usr/man \ --infodir=/usr/info \ --with-terminfo-dirs=/usr/share/terminfo \ @@ -71,6 +75,7 @@ $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.patched --without-profile --without-debug --disable-rpath \ --enable-echo --enable-const --enable-overwrite \ --enable-broken_linker \ + $(NCURSES_WANT_STATIC) \ ); touch $@ @@ -78,13 +83,13 @@ $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER): $(NCURSES_DIR)/.configured $(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \ libs panel menu form headers -$(STAGING_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER) +$(STAGING_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER) $(MAKE1) \ prefix=$(STAGING_DIR)/usr/ \ exec_prefix=$(STAGING_DIR) \ bindir=$(STAGING_DIR)/bin \ sbindir=$(STAGING_DIR)/sbin \ - libexecdir=$(STAGING_DIR)/lib \ + libexecdir=$(STAGING_DIR)/usr/lib \ datadir=$(STAGING_DIR)/usr/share \ sysconfdir=$(STAGING_DIR)/etc \ localstatedir=$(STAGING_DIR)/var \ @@ -98,8 +103,8 @@ $(STAGING_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VER) chmod a-x $(NCURSES_DIR)/lib/libncurses.so* touch -c $@ -$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER): $(STAGING_DIR)/lib/libncurses.a - cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/ +$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VER): $(STAGING_DIR)/usr/lib/libncurses.a + cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/ -cp -dpf $(STAGING_DIR)/usr/lib/terminfo $(TARGET_DIR)/usr/lib/ mkdir -p $(TARGET_DIR)/usr/share/terminfo/x cp -dpf $(STAGING_DIR)/usr/share/terminfo/x/xterm $(TARGET_DIR)/usr/share/terminfo/x @@ -142,6 +147,7 @@ ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE) ncurses-clean: rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so* + rm -f $(STAGING_DIR)/usr/lib/libncurses.so* $(TARGET_DIR)/usr/lib/libncurses.so* rm -rf $(STAGING_DIR)/usr/share/tabset $(TARGET_DIR)/usr/share/tabset rm -rf $(STAGING_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/terminfo -$(MAKE) -C $(NCURSES_DIR) clean |