From cbd9e398d85a676d1cc6a637ce8b52ae8a6436aa Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Wed, 19 Jan 2011 10:53:21 +0800 Subject: [PATCH] imgv, add rpath-link to CFLAGS nethack, fix the install typo --- imgv/Makefile | 2 +- nethack/Makefile | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/imgv/Makefile b/imgv/Makefile index 103170b..71357c6 100644 --- a/imgv/Makefile +++ b/imgv/Makefile @@ -29,7 +29,7 @@ define Package/imgv URL:=http://projects.qi-hardware.com/index.php/p/imgv/ endef - +TARGET_CFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib MAKE_VARS += TARGETPATH=$(STAGING_DIR) define Package/imgv/install diff --git a/nethack/Makefile b/nethack/Makefile index 3320318..b730af8 100644 --- a/nethack/Makefile +++ b/nethack/Makefile @@ -56,19 +56,15 @@ endef define Package/nethack/install $(INSTALL_DIR) \ $(1)/usr/bin \ - $(1)/usr/lib/nethackdir + $(1)/usr/games/lib/nethackdir $(INSTALL_BIN) \ - $(PKG_BUILD_DIR)/src/nethack \ - $(1)/usr/lib/nethackdir/ - - $(CP) \ - $(PKG_BUILD_DIR)/jemarch-bin/nethack-3.4.3-nanonote-bin/lib/nethackdir/* - $(1)/usr/lib/nethackdir/ - - $(CP) \ $(PKG_BUILD_DIR)/src/nethack \ $(1)/usr/bin/ + + $(CP) \ + $(PKG_BUILD_DIR)/jemarch-bin/nethack-3.4.3-nanonote-bin/lib/nethackdir/* \ + $(1)/usr/games/lib/nethackdir endef $(eval $(call BuildPackage,nethack))