From: John Crispin Date: Sun, 7 Oct 2007 03:20:26 +0000 (+0000) Subject: InstallDev should be using (1) and not (STAGING_DIR) X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=647ddb025c8dba3487ba6008da70e14fa938deaa;p=openwrt%2Fsvn-archive%2Fpackages.git InstallDev should be using (1) and not (STAGING_DIR) SVN-Revision: 9173 --- diff --git a/XOrg/app/fontconfig/Makefile b/XOrg/app/fontconfig/Makefile index 414e73d6c..e0000a4ec 100644 --- a/XOrg/app/fontconfig/Makefile +++ b/XOrg/app/fontconfig/Makefile @@ -48,11 +48,11 @@ define Package/fontconfig/install endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/{lib,include} - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libfontconfig.la + $(INSTALL_DIR) $(1)/usr/{lib,include} + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libfontconfig.la endef $(eval $(call BuildPackage,fontconfig)) diff --git a/XOrg/app/xcalc/Makefile b/XOrg/app/xcalc/Makefile index c1885263b..36b67cf16 100644 --- a/XOrg/app/xcalc/Makefile +++ b/XOrg/app/xcalc/Makefile @@ -33,7 +33,7 @@ define Package/xcalc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xcalc,xdm) diff --git a/XOrg/app/xclipboard/Makefile b/XOrg/app/xclipboard/Makefile index a69e1b71b..33cb6605f 100644 --- a/XOrg/app/xclipboard/Makefile +++ b/XOrg/app/xclipboard/Makefile @@ -33,7 +33,7 @@ define Package/xclipboard endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xclipboard,xdm) diff --git a/XOrg/app/xdm/Makefile b/XOrg/app/xdm/Makefile index 86718e6f9..de8372e3e 100644 --- a/XOrg/app/xdm/Makefile +++ b/XOrg/app/xdm/Makefile @@ -33,7 +33,7 @@ define Package/xdm endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xdm,xdm) diff --git a/XOrg/app/xeyes/Makefile b/XOrg/app/xeyes/Makefile index 92f28723f..9db9c193c 100644 --- a/XOrg/app/xeyes/Makefile +++ b/XOrg/app/xeyes/Makefile @@ -33,7 +33,7 @@ define Package/xeyes endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xeyes,xdm) diff --git a/XOrg/app/xine-ui/Makefile b/XOrg/app/xine-ui/Makefile index f7822e7ae..e473a17a3 100644 --- a/XOrg/app/xine-ui/Makefile +++ b/XOrg/app/xine-ui/Makefile @@ -27,7 +27,7 @@ define Package/xine-ui DEPENDS:=+xine-lib +libpng +curl +libiconv +libXv +libICE +libXxf86vm endef -CONFIGURE_VARS+=PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" +CONFIGURE_VARS+=PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lnotimpl" CONFIGURE_ARGS+=--without-aalib \ --without-libcaca \ --disable-lirc \ @@ -51,7 +51,7 @@ define Build/Compile endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/ + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ endef define Package/xine-ui/install diff --git a/XOrg/app/xinit/Makefile b/XOrg/app/xinit/Makefile index 25ed59c7a..8749a5bd8 100644 --- a/XOrg/app/xinit/Makefile +++ b/XOrg/app/xinit/Makefile @@ -33,7 +33,7 @@ define Package/xinit endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xinit,xdm) diff --git a/XOrg/app/xlogo/Makefile b/XOrg/app/xlogo/Makefile index eed759f7d..d1d5a819a 100644 --- a/XOrg/app/xlogo/Makefile +++ b/XOrg/app/xlogo/Makefile @@ -33,7 +33,7 @@ define Package/xlogo endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xlogo,xdm) diff --git a/XOrg/app/xset/Makefile b/XOrg/app/xset/Makefile index 6c5412afc..a195db36f 100644 --- a/XOrg/app/xset/Makefile +++ b/XOrg/app/xset/Makefile @@ -33,7 +33,7 @@ define Package/xset endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef ifeq (xset,xdm) diff --git a/XOrg/driver/xf86-input-evdev/Makefile b/XOrg/driver/xf86-input-evdev/Makefile index 7496cdbe3..54d6bc6d9 100644 --- a/XOrg/driver/xf86-input-evdev/Makefile +++ b/XOrg/driver/xf86-input-evdev/Makefile @@ -27,7 +27,7 @@ define Package/xf86-input-evdev endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/driver/xf86-input-keyboard/Makefile b/XOrg/driver/xf86-input-keyboard/Makefile index c0efeddc6..3e404ae1a 100644 --- a/XOrg/driver/xf86-input-keyboard/Makefile +++ b/XOrg/driver/xf86-input-keyboard/Makefile @@ -27,7 +27,7 @@ define Package/xf86-input-keyboard endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/driver/xf86-input-mouse/Makefile b/XOrg/driver/xf86-input-mouse/Makefile index c4867b625..523c4d603 100644 --- a/XOrg/driver/xf86-input-mouse/Makefile +++ b/XOrg/driver/xf86-input-mouse/Makefile @@ -27,7 +27,7 @@ define Package/xf86-input-mouse endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/driver/xf86-video-ati/Makefile b/XOrg/driver/xf86-video-ati/Makefile index c66a3df64..c667ffe3e 100644 --- a/XOrg/driver/xf86-video-ati/Makefile +++ b/XOrg/driver/xf86-video-ati/Makefile @@ -27,7 +27,7 @@ define Package/xf86-video-ati endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/driver/xf86-video-fbdev/Makefile b/XOrg/driver/xf86-video-fbdev/Makefile index c5876715c..64e78c5d3 100644 --- a/XOrg/driver/xf86-video-fbdev/Makefile +++ b/XOrg/driver/xf86-video-fbdev/Makefile @@ -27,7 +27,7 @@ define Package/xf86-video-fbdev endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/driver/xf86-video-i810/Makefile b/XOrg/driver/xf86-video-i810/Makefile index d9d99c288..63404edf5 100644 --- a/XOrg/driver/xf86-video-i810/Makefile +++ b/XOrg/driver/xf86-video-i810/Makefile @@ -27,7 +27,7 @@ define Package/xf86-video-i810 endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/driver/xf86-video-nv/Makefile b/XOrg/driver/xf86-video-nv/Makefile index aefc7599d..eb0540a67 100644 --- a/XOrg/driver/xf86-video-nv/Makefile +++ b/XOrg/driver/xf86-video-nv/Makefile @@ -27,7 +27,7 @@ define Package/xf86-video-nv endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/driver/xf86-video-vesa/Makefile b/XOrg/driver/xf86-video-vesa/Makefile index f1ae0df41..362ae72d7 100644 --- a/XOrg/driver/xf86-video-vesa/Makefile +++ b/XOrg/driver/xf86-video-vesa/Makefile @@ -27,7 +27,7 @@ define Package/xf86-video-vesa endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/driver/xf86-video-vga/Makefile b/XOrg/driver/xf86-video-vga/Makefile index 95291fcfc..a67906db6 100644 --- a/XOrg/driver/xf86-video-vga/Makefile +++ b/XOrg/driver/xf86-video-vga/Makefile @@ -27,7 +27,7 @@ define Package/xf86-video-vga endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ diff --git a/XOrg/font-native/font-util/Makefile b/XOrg/font-native/font-util/Makefile index f441f955c..491f24be5 100644 --- a/XOrg/font-native/font-util/Makefile +++ b/XOrg/font-native/font-util/Makefile @@ -35,9 +35,9 @@ define Build/Compile endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/pkgconfig/fontutil.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/X11/* $(STAGING_DIR)/usr/lib/X11/ - $(CP) $(PKG_INSTALL_DIR)/usr/local/bin/* $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/pkgconfig/fontutil.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/X11/* $(1)/usr/lib/X11/ + $(CP) $(PKG_INSTALL_DIR)/usr/local/bin/* $(1)/usr/bin/ endef $(eval $(call BuildPackage,font-util)) diff --git a/XOrg/font/encodings/Makefile b/XOrg/font/encodings/Makefile index 6e596638d..f3ee239d7 100644 --- a/XOrg/font/encodings/Makefile +++ b/XOrg/font/encodings/Makefile @@ -27,7 +27,7 @@ define Package/encodings endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-alias/Makefile b/XOrg/font/font-alias/Makefile index 810b233af..3eb085d51 100644 --- a/XOrg/font/font-alias/Makefile +++ b/XOrg/font/font-alias/Makefile @@ -27,7 +27,7 @@ define Package/font-alias endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-bh-75dpi/Makefile b/XOrg/font/font-bh-75dpi/Makefile index 8da0a1031..6618f5826 100644 --- a/XOrg/font/font-bh-75dpi/Makefile +++ b/XOrg/font/font-bh-75dpi/Makefile @@ -27,7 +27,7 @@ define Package/font-bh-75dpi endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-cursor-misc/Makefile b/XOrg/font/font-cursor-misc/Makefile index df04eecf1..1ad0b8c5f 100644 --- a/XOrg/font/font-cursor-misc/Makefile +++ b/XOrg/font/font-cursor-misc/Makefile @@ -27,7 +27,7 @@ define Package/font-cursor-misc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-daewoo-misc/Makefile b/XOrg/font/font-daewoo-misc/Makefile index 72ed5130c..e7dec1874 100644 --- a/XOrg/font/font-daewoo-misc/Makefile +++ b/XOrg/font/font-daewoo-misc/Makefile @@ -27,7 +27,7 @@ define Package/font-daewoo-misc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-dec-misc/Makefile b/XOrg/font/font-dec-misc/Makefile index 5fcb5519f..a7a41b39d 100644 --- a/XOrg/font/font-dec-misc/Makefile +++ b/XOrg/font/font-dec-misc/Makefile @@ -27,7 +27,7 @@ define Package/font-dec-misc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-ibm-type1/Makefile b/XOrg/font/font-ibm-type1/Makefile index bae954b93..fd4b07b06 100644 --- a/XOrg/font/font-ibm-type1/Makefile +++ b/XOrg/font/font-ibm-type1/Makefile @@ -27,7 +27,7 @@ define Package/font-ibm-type1 endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-isas-misc/Makefile b/XOrg/font/font-isas-misc/Makefile index a58918335..a6f7039dc 100644 --- a/XOrg/font/font-isas-misc/Makefile +++ b/XOrg/font/font-isas-misc/Makefile @@ -27,7 +27,7 @@ define Package/font-isas-misc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-jis-misc/Makefile b/XOrg/font/font-jis-misc/Makefile index b9064816a..90b875fb5 100644 --- a/XOrg/font/font-jis-misc/Makefile +++ b/XOrg/font/font-jis-misc/Makefile @@ -27,7 +27,7 @@ define Package/font-jis-misc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-micro-misc/Makefile b/XOrg/font/font-micro-misc/Makefile index e6c96b764..b22182e81 100644 --- a/XOrg/font/font-micro-misc/Makefile +++ b/XOrg/font/font-micro-misc/Makefile @@ -27,7 +27,7 @@ define Package/font-micro-misc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-misc-cyrillic/Makefile b/XOrg/font/font-misc-cyrillic/Makefile index 7c5e14263..435dded3f 100644 --- a/XOrg/font/font-misc-cyrillic/Makefile +++ b/XOrg/font/font-misc-cyrillic/Makefile @@ -27,7 +27,7 @@ define Package/font-misc-cyrillic endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/font/font-misc-misc/Makefile b/XOrg/font/font-misc-misc/Makefile index 2edd9be8f..acb4b76f3 100644 --- a/XOrg/font/font-misc-misc/Makefile +++ b/XOrg/font/font-misc-misc/Makefile @@ -61,7 +61,7 @@ define Build/Configure endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Package/font-base/install diff --git a/XOrg/font/font-xfree86-type1/Makefile b/XOrg/font/font-xfree86-type1/Makefile index d8fb30cad..2ca102c38 100644 --- a/XOrg/font/font-xfree86-type1/Makefile +++ b/XOrg/font/font-xfree86-type1/Makefile @@ -27,7 +27,7 @@ define Package/font-xfree86-type1 endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 diff --git a/XOrg/headers/native/Makefile b/XOrg/headers/native/Makefile index fd5f9b95b..eb8371b0f 100644 --- a/XOrg/headers/native/Makefile +++ b/XOrg/headers/native/Makefile @@ -33,7 +33,7 @@ define Build/Compile endef define Build/InstallDev - cp -r $(PKG_BUILD_DIR)/* $(STAGING_DIR)/include/ + cp -r $(PKG_BUILD_DIR)/* $(1)/include/ endef $(eval $(call BuildPackage,xorg-headers-native)) diff --git a/XOrg/lib/atk/Makefile b/XOrg/lib/atk/Makefile index 902a6ecee..2a13064a7 100644 --- a/XOrg/lib/atk/Makefile +++ b/XOrg/lib/atk/Makefile @@ -45,11 +45,11 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/{lib,include} - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libatk-1.0.la + $(INSTALL_DIR) $(1)/usr/{lib,include} + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libatk-1.0.la endef define Package/atk/Install diff --git a/XOrg/lib/cairo/Makefile b/XOrg/lib/cairo/Makefile index 31f5e327d..c86e3d07b 100644 --- a/XOrg/lib/cairo/Makefile +++ b/XOrg/lib/cairo/Makefile @@ -45,11 +45,11 @@ define Build/Compile endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/ - $(SED) "s,-L/usr/local/lib,,g" $(STAGING_DIR)/usr/lib/libcairo.la - $(SED) "s,/usr/lib/libfontconfig.la,$(STAGING_DIR)/usr/lib/libfontconfig.la,g" $(STAGING_DIR)/usr/lib/libcairo.la - $(SED) "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(STAGING_DIR)/usr/lib/libcairo.la - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libcairo.la + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(SED) "s,-L/usr/local/lib,,g" $(1)/usr/lib/libcairo.la + $(SED) "s,/usr/lib/libfontconfig.la,$(1)/usr/lib/libfontconfig.la,g" $(1)/usr/lib/libcairo.la + $(SED) "s,$(1)$(1),$(1),g" $(1)/usr/lib/libcairo.la + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libcairo.la endef define Package/cairo/Install diff --git a/XOrg/lib/gtk-1.2.10/Makefile b/XOrg/lib/gtk-1.2.10/Makefile index ccd8a4d33..15691d948 100644 --- a/XOrg/lib/gtk-1.2.10/Makefile +++ b/XOrg/lib/gtk-1.2.10/Makefile @@ -54,9 +54,9 @@ define Build/Compile endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/ - $(SED) "s,libdirs=-L.*,libdirs=,g" $(STAGING_DIR)/usr/bin/gtk-config - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}.la + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(SED) "s,libdirs=-L.*,libdirs=,g" $(1)/usr/bin/gtk-config + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/lib{gtk,gdk}.la endef $(eval $(call BuildPackage,gtk-1.2.10)) diff --git a/XOrg/lib/gtk-2.8.20/Makefile b/XOrg/lib/gtk-2.8.20/Makefile index 40c3fd6d3..13acf6b61 100644 --- a/XOrg/lib/gtk-2.8.20/Makefile +++ b/XOrg/lib/gtk-2.8.20/Makefile @@ -48,11 +48,11 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/{lib/pkgconfig,include} - $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/lib{gtk,gdk}*-2.0.la + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include} + $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/lib{gtk,gdk}*-2.0.la endef $(eval $(call BuildPackage,gtk-2.8.20)) diff --git a/XOrg/lib/libICE/Makefile b/XOrg/lib/libICE/Makefile index ac3ff23d8..30a1ee02e 100644 --- a/XOrg/lib/libICE/Makefile +++ b/XOrg/lib/libICE/Makefile @@ -27,7 +27,7 @@ define Package/libICE endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libICE,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libICE)) diff --git a/XOrg/lib/libSM/Makefile b/XOrg/lib/libSM/Makefile index af9ee7aa1..6c6a7c40e 100644 --- a/XOrg/lib/libSM/Makefile +++ b/XOrg/lib/libSM/Makefile @@ -27,7 +27,7 @@ define Package/libSM endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libSM,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libSM)) diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile index 562951e59..df54b76fb 100644 --- a/XOrg/lib/libX11/Makefile +++ b/XOrg/lib/libX11/Makefile @@ -27,7 +27,7 @@ define Package/libX11 endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libX11,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libX11)) diff --git a/XOrg/lib/libXau/Makefile b/XOrg/lib/libXau/Makefile index 857c9d016..db08458df 100644 --- a/XOrg/lib/libXau/Makefile +++ b/XOrg/lib/libXau/Makefile @@ -27,7 +27,7 @@ define Package/libXau endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXau,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXau)) diff --git a/XOrg/lib/libXaw/Makefile b/XOrg/lib/libXaw/Makefile index dbf982c28..53213f12d 100644 --- a/XOrg/lib/libXaw/Makefile +++ b/XOrg/lib/libXaw/Makefile @@ -27,7 +27,7 @@ define Package/libXaw endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXaw,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXaw)) diff --git a/XOrg/lib/libXdmcp/Makefile b/XOrg/lib/libXdmcp/Makefile index d38da0e37..9c8d73c9d 100644 --- a/XOrg/lib/libXdmcp/Makefile +++ b/XOrg/lib/libXdmcp/Makefile @@ -27,7 +27,7 @@ define Package/libXdmcp endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXdmcp,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXdmcp)) diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile index ff2603ba5..7e60cdf0c 100644 --- a/XOrg/lib/libXext/Makefile +++ b/XOrg/lib/libXext/Makefile @@ -27,7 +27,7 @@ define Package/libXext endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXext,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXext)) diff --git a/XOrg/lib/libXfont/Makefile b/XOrg/lib/libXfont/Makefile index 94c71201e..32f084069 100644 --- a/XOrg/lib/libXfont/Makefile +++ b/XOrg/lib/libXfont/Makefile @@ -27,7 +27,7 @@ define Package/libXfont endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXfont,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXfont)) diff --git a/XOrg/lib/libXmu/Makefile b/XOrg/lib/libXmu/Makefile index 13437be77..9fbbc396a 100644 --- a/XOrg/lib/libXmu/Makefile +++ b/XOrg/lib/libXmu/Makefile @@ -27,7 +27,7 @@ define Package/libXmu endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXmu,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXmu)) diff --git a/XOrg/lib/libXpm/Makefile b/XOrg/lib/libXpm/Makefile index f1b695ecc..38ee6aae9 100644 --- a/XOrg/lib/libXpm/Makefile +++ b/XOrg/lib/libXpm/Makefile @@ -27,7 +27,7 @@ define Package/libXpm endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXpm,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXpm)) diff --git a/XOrg/lib/libXrandr/Makefile b/XOrg/lib/libXrandr/Makefile index a01de5ae3..65e7ef06e 100644 --- a/XOrg/lib/libXrandr/Makefile +++ b/XOrg/lib/libXrandr/Makefile @@ -27,7 +27,7 @@ define Package/libXrandr endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXrandr,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXrandr)) diff --git a/XOrg/lib/libXrender/Makefile b/XOrg/lib/libXrender/Makefile index 2e9e85674..2fa8b6eef 100644 --- a/XOrg/lib/libXrender/Makefile +++ b/XOrg/lib/libXrender/Makefile @@ -27,7 +27,7 @@ define Package/libXrender endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXrender,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXrender)) diff --git a/XOrg/lib/libXt/Makefile b/XOrg/lib/libXt/Makefile index 021fb0e5e..5cfb89e41 100644 --- a/XOrg/lib/libXt/Makefile +++ b/XOrg/lib/libXt/Makefile @@ -27,7 +27,7 @@ define Package/libXt endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXt,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXt)) diff --git a/XOrg/lib/libXv/Makefile b/XOrg/lib/libXv/Makefile index beeb9adc6..d76c00f23 100644 --- a/XOrg/lib/libXv/Makefile +++ b/XOrg/lib/libXv/Makefile @@ -27,7 +27,7 @@ define Package/libXv endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXv,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXv)) diff --git a/XOrg/lib/libXvMC/Makefile b/XOrg/lib/libXvMC/Makefile index 70ab572c5..e4f987297 100644 --- a/XOrg/lib/libXvMC/Makefile +++ b/XOrg/lib/libXvMC/Makefile @@ -27,7 +27,7 @@ define Package/libXvMC endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXvMC,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXvMC)) diff --git a/XOrg/lib/libXxf86misc/Makefile b/XOrg/lib/libXxf86misc/Makefile index 63d226b8f..ca5178295 100644 --- a/XOrg/lib/libXxf86misc/Makefile +++ b/XOrg/lib/libXxf86misc/Makefile @@ -27,7 +27,7 @@ define Package/libXxf86misc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXxf86misc,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXxf86misc)) diff --git a/XOrg/lib/libXxf86vm/Makefile b/XOrg/lib/libXxf86vm/Makefile index a84119f54..e00b3d41c 100644 --- a/XOrg/lib/libXxf86vm/Makefile +++ b/XOrg/lib/libXxf86vm/Makefile @@ -27,7 +27,7 @@ define Package/libXxf86vm endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libXxf86vm,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libXxf86vm)) diff --git a/XOrg/lib/libfontenc/Makefile b/XOrg/lib/libfontenc/Makefile index c8f8606c9..964a21157 100644 --- a/XOrg/lib/libfontenc/Makefile +++ b/XOrg/lib/libfontenc/Makefile @@ -27,7 +27,7 @@ define Package/libfontenc endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libfontenc,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libfontenc)) diff --git a/XOrg/lib/libxkbfile/Makefile b/XOrg/lib/libxkbfile/Makefile index 4f55ad6ad..ea26cbf7d 100644 --- a/XOrg/lib/libxkbfile/Makefile +++ b/XOrg/lib/libxkbfile/Makefile @@ -27,7 +27,7 @@ define Package/libxkbfile endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libxkbfile,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libxkbfile)) diff --git a/XOrg/lib/libxkbui/Makefile b/XOrg/lib/libxkbui/Makefile index 13cae9a5e..057146e56 100644 --- a/XOrg/lib/libxkbui/Makefile +++ b/XOrg/lib/libxkbui/Makefile @@ -27,7 +27,7 @@ define Package/libxkbui endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (libxkbui,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,libxkbui)) diff --git a/XOrg/lib/pango/Makefile b/XOrg/lib/pango/Makefile index ebbc70810..ef09a73b0 100644 --- a/XOrg/lib/pango/Makefile +++ b/XOrg/lib/pango/Makefile @@ -52,12 +52,12 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/{lib,include} - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ - $(SED) "s,Libs:,Libs: -L$$$${libdir}/libiconv/lib/ -L$$$${libdir}/libintl/lib/ ,g" $(STAGING_DIR)/usr/lib/pkgconfig/pango*.pc - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libpango*.la + $(INSTALL_DIR) $(1)/usr/{lib,include} + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(SED) "s,Libs:,Libs: -L$$$${libdir}/libiconv/lib/ -L$$$${libdir}/libintl/lib/ ,g" $(1)/usr/lib/pkgconfig/pango*.pc + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libpango*.la endef define Package/pango/Install diff --git a/XOrg/lib/xine-lib/Makefile b/XOrg/lib/xine-lib/Makefile index 6e05a362f..9694431dc 100644 --- a/XOrg/lib/xine-lib/Makefile +++ b/XOrg/lib/xine-lib/Makefile @@ -47,9 +47,9 @@ define Build/Compile endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/ - $(SED) 's,-I$$$${prefix}/include,-I$(STAGING_DIR)/usr/include/,g' $(STAGING_DIR)/usr/bin/xine-config - $(SED) 's,-L$$$${exec_prefix}/lib,-L$(STAGING_DIR)/usr/lib/,g' $(STAGING_DIR)/usr/bin/xine-config + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(SED) 's,-I$$$${prefix}/include,-I$(1)/usr/include/,g' $(1)/usr/bin/xine-config + $(SED) 's,-L$$$${exec_prefix}/lib,-L$(1)/usr/lib/,g' $(1)/usr/bin/xine-config endef define Package/xine-lib/install diff --git a/XOrg/lib/xtrans/Makefile b/XOrg/lib/xtrans/Makefile index e80c50490..80bd5c86f 100644 --- a/XOrg/lib/xtrans/Makefile +++ b/XOrg/lib/xtrans/Makefile @@ -27,7 +27,7 @@ define Package/xtrans endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef ifeq (xtrans,libX11) @@ -80,7 +80,7 @@ define Package/libXaw/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR) + $(CP) $(PKG_INSTALL_DIR)/* $(1) endef $(eval $(call BuildPackage,xtrans)) diff --git a/XOrg/misc/Mesa/Makefile b/XOrg/misc/Mesa/Makefile index cb96bc2d8..866d1e85d 100644 --- a/XOrg/misc/Mesa/Makefile +++ b/XOrg/misc/Mesa/Makefile @@ -33,7 +33,7 @@ define Build/Compile endef define Build/InstallDev - $(CP) -r $(PKG_BUILD_DIR)/include/* $(STAGING_DIR)/usr/include + $(CP) -r $(PKG_BUILD_DIR)/include/* $(1)/usr/include endef $(eval $(call BuildPackage,Mesa)) diff --git a/XOrg/misc/libdrm/Makefile b/XOrg/misc/libdrm/Makefile index c1279fb23..a54c4e07c 100644 --- a/XOrg/misc/libdrm/Makefile +++ b/XOrg/misc/libdrm/Makefile @@ -36,10 +36,10 @@ define Build/Compile endef define Build/InstallDev - $(CP) $(PKG_BUILD_DIR)/libdrm/*.h $(STAGING_DIR)/include - $(CP) $(PKG_BUILD_DIR)/shared-core/*.h $(STAGING_DIR)/include - $(CP) $(PKG_BUILD_DIR)/libdrm/.libs/libdrm.so* $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/libdrm.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_BUILD_DIR)/libdrm/*.h $(1)/include + $(CP) $(PKG_BUILD_DIR)/shared-core/*.h $(1)/include + $(CP) $(PKG_BUILD_DIR)/libdrm/.libs/libdrm.so* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libdrm.pc $(1)/usr/lib/pkgconfig/ endef define Package/libdrm/install diff --git a/XOrg/proto/applewmproto/Makefile b/XOrg/proto/applewmproto/Makefile index e9552f106..72b9e9378 100644 --- a/XOrg/proto/applewmproto/Makefile +++ b/XOrg/proto/applewmproto/Makefile @@ -26,7 +26,7 @@ define Package/applewmproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/bigreqsproto/Makefile b/XOrg/proto/bigreqsproto/Makefile index b50993e32..915dcb6dc 100644 --- a/XOrg/proto/bigreqsproto/Makefile +++ b/XOrg/proto/bigreqsproto/Makefile @@ -26,7 +26,7 @@ define Package/bigreqsproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/calibrateproto/Makefile b/XOrg/proto/calibrateproto/Makefile index 7952acd8d..e284cd6f6 100644 --- a/XOrg/proto/calibrateproto/Makefile +++ b/XOrg/proto/calibrateproto/Makefile @@ -30,7 +30,7 @@ $(call Build/Prepare/Default) endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/$(SUBPACKAGE) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/$(SUBPACKAGE) $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/compositeproto/Makefile b/XOrg/proto/compositeproto/Makefile index 439c2dd55..548986858 100644 --- a/XOrg/proto/compositeproto/Makefile +++ b/XOrg/proto/compositeproto/Makefile @@ -26,7 +26,7 @@ define Package/compositeproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/damageproto/Makefile b/XOrg/proto/damageproto/Makefile index c5446ce8f..6c671e6f4 100644 --- a/XOrg/proto/damageproto/Makefile +++ b/XOrg/proto/damageproto/Makefile @@ -26,7 +26,7 @@ define Package/damageproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/dmxproto/Makefile b/XOrg/proto/dmxproto/Makefile index 2ad1c8ec8..a1ef96be9 100644 --- a/XOrg/proto/dmxproto/Makefile +++ b/XOrg/proto/dmxproto/Makefile @@ -26,7 +26,7 @@ define Package/dmxproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/evieext/Makefile b/XOrg/proto/evieext/Makefile index 8b8390560..3d39c0d6d 100644 --- a/XOrg/proto/evieext/Makefile +++ b/XOrg/proto/evieext/Makefile @@ -26,7 +26,7 @@ define Package/evieext endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/fixesproto/Makefile b/XOrg/proto/fixesproto/Makefile index 70e11ba47..7beb8eeb3 100644 --- a/XOrg/proto/fixesproto/Makefile +++ b/XOrg/proto/fixesproto/Makefile @@ -26,7 +26,7 @@ define Package/fixesproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/fontcacheproto/Makefile b/XOrg/proto/fontcacheproto/Makefile index 33784c2a7..7301fda95 100644 --- a/XOrg/proto/fontcacheproto/Makefile +++ b/XOrg/proto/fontcacheproto/Makefile @@ -26,7 +26,7 @@ define Package/fontcacheproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/fontsproto/Makefile b/XOrg/proto/fontsproto/Makefile index a64f7be8b..221d44391 100644 --- a/XOrg/proto/fontsproto/Makefile +++ b/XOrg/proto/fontsproto/Makefile @@ -26,7 +26,7 @@ define Package/fontsproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/glproto/Makefile b/XOrg/proto/glproto/Makefile index 03c010590..94d7bb7a1 100644 --- a/XOrg/proto/glproto/Makefile +++ b/XOrg/proto/glproto/Makefile @@ -26,7 +26,7 @@ define Package/glproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/inputproto/Makefile b/XOrg/proto/inputproto/Makefile index 5834055d5..b81c87d96 100644 --- a/XOrg/proto/inputproto/Makefile +++ b/XOrg/proto/inputproto/Makefile @@ -26,7 +26,7 @@ define Package/inputproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/kbproto/Makefile b/XOrg/proto/kbproto/Makefile index 5c6f4a277..584d518b3 100644 --- a/XOrg/proto/kbproto/Makefile +++ b/XOrg/proto/kbproto/Makefile @@ -26,7 +26,7 @@ define Package/kbproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/printproto/Makefile b/XOrg/proto/printproto/Makefile index 9280a660b..f6c26d08d 100644 --- a/XOrg/proto/printproto/Makefile +++ b/XOrg/proto/printproto/Makefile @@ -26,7 +26,7 @@ define Package/printproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/randrproto/Makefile b/XOrg/proto/randrproto/Makefile index a5cd5d831..b244891d4 100644 --- a/XOrg/proto/randrproto/Makefile +++ b/XOrg/proto/randrproto/Makefile @@ -26,7 +26,7 @@ define Package/randrproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/recordproto/Makefile b/XOrg/proto/recordproto/Makefile index 1b07a4ce5..8109dacae 100644 --- a/XOrg/proto/recordproto/Makefile +++ b/XOrg/proto/recordproto/Makefile @@ -26,7 +26,7 @@ define Package/recordproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/renderproto/Makefile b/XOrg/proto/renderproto/Makefile index ade9fa229..6ac8b9136 100644 --- a/XOrg/proto/renderproto/Makefile +++ b/XOrg/proto/renderproto/Makefile @@ -26,7 +26,7 @@ define Package/renderproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/resourceproto/Makefile b/XOrg/proto/resourceproto/Makefile index d4e93243b..ec0e19bbe 100644 --- a/XOrg/proto/resourceproto/Makefile +++ b/XOrg/proto/resourceproto/Makefile @@ -26,7 +26,7 @@ define Package/resourceproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/scrnsaverproto/Makefile b/XOrg/proto/scrnsaverproto/Makefile index f1dba5002..50faccf86 100644 --- a/XOrg/proto/scrnsaverproto/Makefile +++ b/XOrg/proto/scrnsaverproto/Makefile @@ -26,7 +26,7 @@ define Package/scrnsaverproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/trapproto/Makefile b/XOrg/proto/trapproto/Makefile index 71cbe55e3..b6601dd3d 100644 --- a/XOrg/proto/trapproto/Makefile +++ b/XOrg/proto/trapproto/Makefile @@ -26,7 +26,7 @@ define Package/trapproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/videoproto/Makefile b/XOrg/proto/videoproto/Makefile index 2a442dd2c..d234d1f78 100644 --- a/XOrg/proto/videoproto/Makefile +++ b/XOrg/proto/videoproto/Makefile @@ -26,7 +26,7 @@ define Package/videoproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/windowswmproto/Makefile b/XOrg/proto/windowswmproto/Makefile index c42de8484..5d40b1344 100644 --- a/XOrg/proto/windowswmproto/Makefile +++ b/XOrg/proto/windowswmproto/Makefile @@ -26,7 +26,7 @@ define Package/windowswmproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xcmiscproto/Makefile b/XOrg/proto/xcmiscproto/Makefile index 0fdeec468..54bf619e2 100644 --- a/XOrg/proto/xcmiscproto/Makefile +++ b/XOrg/proto/xcmiscproto/Makefile @@ -26,7 +26,7 @@ define Package/xcmiscproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xextproto/Makefile b/XOrg/proto/xextproto/Makefile index 4e40dd92f..8207dca1e 100644 --- a/XOrg/proto/xextproto/Makefile +++ b/XOrg/proto/xextproto/Makefile @@ -26,7 +26,7 @@ define Package/xextproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86bigfontproto/Makefile b/XOrg/proto/xf86bigfontproto/Makefile index b09902e1e..721ec0cbc 100644 --- a/XOrg/proto/xf86bigfontproto/Makefile +++ b/XOrg/proto/xf86bigfontproto/Makefile @@ -26,7 +26,7 @@ define Package/xf86bigfontproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86dgaproto/Makefile b/XOrg/proto/xf86dgaproto/Makefile index 85de8e5db..2309d0423 100644 --- a/XOrg/proto/xf86dgaproto/Makefile +++ b/XOrg/proto/xf86dgaproto/Makefile @@ -26,7 +26,7 @@ define Package/xf86dgaproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86driproto/Makefile b/XOrg/proto/xf86driproto/Makefile index 4a9a57f93..4d0a81fb2 100644 --- a/XOrg/proto/xf86driproto/Makefile +++ b/XOrg/proto/xf86driproto/Makefile @@ -26,7 +26,7 @@ define Package/xf86driproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86miscproto/Makefile b/XOrg/proto/xf86miscproto/Makefile index 583d342c8..867cbc65c 100644 --- a/XOrg/proto/xf86miscproto/Makefile +++ b/XOrg/proto/xf86miscproto/Makefile @@ -26,7 +26,7 @@ define Package/xf86miscproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86rushproto/Makefile b/XOrg/proto/xf86rushproto/Makefile index d95c5835c..2548d4e12 100644 --- a/XOrg/proto/xf86rushproto/Makefile +++ b/XOrg/proto/xf86rushproto/Makefile @@ -26,7 +26,7 @@ define Package/xf86rushproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xf86vidmodeproto/Makefile b/XOrg/proto/xf86vidmodeproto/Makefile index f86cd3410..23a22c361 100644 --- a/XOrg/proto/xf86vidmodeproto/Makefile +++ b/XOrg/proto/xf86vidmodeproto/Makefile @@ -26,7 +26,7 @@ define Package/xf86vidmodeproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xineramaproto/Makefile b/XOrg/proto/xineramaproto/Makefile index a79f7cf4f..c04d5dbb6 100644 --- a/XOrg/proto/xineramaproto/Makefile +++ b/XOrg/proto/xineramaproto/Makefile @@ -26,7 +26,7 @@ define Package/xineramaproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xproto/Makefile b/XOrg/proto/xproto/Makefile index 6daacd0fb..4a530068d 100644 --- a/XOrg/proto/xproto/Makefile +++ b/XOrg/proto/xproto/Makefile @@ -26,7 +26,7 @@ define Package/xproto endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/proto/xproxymanagementprotocol/Makefile b/XOrg/proto/xproxymanagementprotocol/Makefile index 6c21b0477..2571cae9f 100644 --- a/XOrg/proto/xproxymanagementprotocol/Makefile +++ b/XOrg/proto/xproxymanagementprotocol/Makefile @@ -26,7 +26,7 @@ define Package/xproxymanagementprotocol endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install endef define Build/Compile diff --git a/XOrg/server/xorg-server-X11R7.2/Makefile b/XOrg/server/xorg-server-X11R7.2/Makefile index 44e92ac14..beb1faf8b 100644 --- a/XOrg/server/xorg-server-X11R7.2/Makefile +++ b/XOrg/server/xorg-server-X11R7.2/Makefile @@ -161,8 +161,8 @@ define Packages/xorg-server-config/install endef define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_BUILD_DIR)/xorg-server.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/xorg-server.pc $(1)/usr/lib/pkgconfig/ endef $(eval $(call BuildPackage,xorg-server)) diff --git a/XOrg/utils/util-macros/Makefile b/XOrg/utils/util-macros/Makefile index 06d0d7b13..ea8f4e2e8 100644 --- a/XOrg/utils/util-macros/Makefile +++ b/XOrg/utils/util-macros/Makefile @@ -26,7 +26,7 @@ define Package/util-macros endef define Build/InstallDev - DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install endef define Build/Configure diff --git a/lang/egenix-mx/Makefile b/lang/egenix-mx/Makefile index 72445b0ca..efd4abadc 100644 --- a/lang/egenix-mx/Makefile +++ b/lang/egenix-mx/Makefile @@ -40,39 +40,39 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/BeeBase/mxBeeBase + mkdir -p $(1)$(PYTHON_PKG_DIR)/mx/BeeBase/mxBeeBase $(CP) \ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/mxh.h \ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/btr.h \ $(PKG_BUILD_DIR)/mx/BeeBase/mxBeeBase/mxBeeBase.h \ - $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/BeeBase/mxBeeBase/ - mkdir -p $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/DateTime/mxDateTime + $(1)$(PYTHON_PKG_DIR)/mx/BeeBase/mxBeeBase/ + mkdir -p $(1)$(PYTHON_PKG_DIR)/mx/DateTime/mxDateTime $(CP) \ $(PKG_BUILD_DIR)/mx/DateTime/mxDateTime/mxh.h \ $(PKG_BUILD_DIR)/mx/DateTime/mxDateTime/mxDateTime.h \ - $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/DateTime/mxDateTime/ - mkdir -p $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/Proxy/mxProxy + $(1)$(PYTHON_PKG_DIR)/mx/DateTime/mxDateTime/ + mkdir -p $(1)$(PYTHON_PKG_DIR)/mx/Proxy/mxProxy $(CP) \ $(PKG_BUILD_DIR)/mx/Proxy/mxProxy/mxh.h \ $(PKG_BUILD_DIR)/mx/Proxy/mxProxy/mxProxy.h \ - $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/Proxy/mxProxy/ - mkdir -p $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/Queue/mxQueue + $(1)$(PYTHON_PKG_DIR)/mx/Proxy/mxProxy/ + mkdir -p $(1)$(PYTHON_PKG_DIR)/mx/Queue/mxQueue $(CP) \ $(PKG_BUILD_DIR)/mx/Queue/mxQueue/mxh.h \ $(PKG_BUILD_DIR)/mx/Queue/mxQueue/mxQueue.h \ - $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/Queue/mxQueue/ - mkdir -p $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/TextTools/mxTextTools + $(1)$(PYTHON_PKG_DIR)/mx/Queue/mxQueue/ + mkdir -p $(1)$(PYTHON_PKG_DIR)/mx/TextTools/mxTextTools $(CP) \ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxh.h \ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxbmse.h \ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxte.h \ $(PKG_BUILD_DIR)/mx/TextTools/mxTextTools/mxTextTools.h \ - $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/TextTools/mxTextTools/ - mkdir -p $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/Tools/mxTools + $(1)$(PYTHON_PKG_DIR)/mx/TextTools/mxTextTools/ + mkdir -p $(1)$(PYTHON_PKG_DIR)/mx/Tools/mxTools $(CP) \ $(PKG_BUILD_DIR)/mx/Tools/mxTools/mxh.h \ $(PKG_BUILD_DIR)/mx/Tools/mxTools/mxTools.h \ - $(STAGING_DIR)$(PYTHON_PKG_DIR)/mx/Tools/mxTools/ + $(1)$(PYTHON_PKG_DIR)/mx/Tools/mxTools/ endef define Build/UninstallDev diff --git a/lang/lua/Makefile b/lang/lua/Makefile index 1a4ec5d8d..f5cde50cc 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -97,13 +97,13 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib,conf}.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so.*} $(STAGING_DIR)/usr/lib/ - ln -sf liblua.so.$(PKG_VERSION) $(STAGING_DIR)/usr/lib/liblua.so - ln -sf liblua.so.$(PKG_VERSION) $(STAGING_DIR)/usr/lib/liblualib.so + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib,conf}.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so.*} $(1)/usr/lib/ + ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblua.so + ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblualib.so endef define Build/UninstallDev diff --git a/lang/python/Makefile b/lang/python/Makefile index 1dcd5f24d..c183445a3 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -87,13 +87,13 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_BUILD_DIR)/hostpython $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/python2.5 $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.5 $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/libpython2.5.a $(STAGING_DIR)/usr/lib/python2.5/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/hostpython $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/python2.5 $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.5 $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libpython2.5.a $(1)/usr/lib/python2.5/ endef define Build/UninstallDev diff --git a/lang/urbi/Makefile b/lang/urbi/Makefile index 34d893594..e3fa9f227 100644 --- a/lang/urbi/Makefile +++ b/lang/urbi/Makefile @@ -45,10 +45,10 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/urbi - $(CP) $(PKG_INSTALL_DIR)/usr/include/urbi* $(STAGING_DIR)/usr/include/urbi/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liburbi* $(STAGING_DIR)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/include/urbi + $(CP) $(PKG_INSTALL_DIR)/usr/include/urbi* $(1)/usr/include/urbi/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liburbi* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 9bae552e0..2ba06839d 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -58,12 +58,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/alsa $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/alsa $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libasound.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/apr/Makefile b/libs/apr/Makefile index 1b170a749..72d211f76 100644 --- a/libs/apr/Makefile +++ b/libs/apr/Makefile @@ -51,24 +51,24 @@ MAKE_FLAGS += \ all install define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin + mkdir -p $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \ - $(STAGING_DIR)/usr/bin - mkdir -p $(STAGING_DIR)/usr/include + $(1)/usr/bin + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/ \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/*apr* \ - $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/share/ + $(1)/usr/lib/ + mkdir -p $(1)/usr/share/ $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/ \ - $(STAGING_DIR)/usr/share/ - $(SED) "s,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1," $(STAGING_DIR)/usr/share/build-1/apr_rules.mk - $(SED) "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apr-1-config - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libapr-1.la - $(SED) "s,"bindir\=\"/usr/bin\"",bindir=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apr-1-config - $(SED) "s,"datadir\=\"/usr/share\"",datadir=\"$(STAGING_DIR)/usr/share\"," $(STAGING_DIR)/usr/bin/apr-1-config - $(SED) "s,"installbuilddir\=\"/usr/share/build-1\"",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\"," $(STAGING_DIR)/usr/bin/apr-1-config + $(1)/usr/share/ + $(SED) "s,/usr/share/build-1,$(1)/usr/share/build-1," $(1)/usr/share/build-1/apr_rules.mk + $(SED) "s,\"/usr\",$(1)/usr," $(1)/usr/bin/apr-1-config + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libapr-1.la + $(SED) "s,"bindir\=\"/usr/bin\"",bindir=\"$(1)/usr/bin\"," $(1)/usr/bin/apr-1-config + $(SED) "s,"datadir\=\"/usr/share\"",datadir=\"$(1)/usr/share\"," $(1)/usr/bin/apr-1-config + $(SED) "s,"installbuilddir\=\"/usr/share/build-1\"",installbuilddir=\"$(1)/usr/share/build-1\"," $(1)/usr/bin/apr-1-config endef define Build/UninstallDev diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index e4e008c43..bd200c83d 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -134,12 +134,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile index 0ac1cdbb3..80621cfb9 100644 --- a/libs/axtls/Makefile +++ b/libs/axtls/Makefile @@ -52,10 +52,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/axTLS $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/axTLS $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/bluez-libs/Makefile b/libs/bluez-libs/Makefile index adffcaf1f..27b296337 100644 --- a/libs/bluez-libs/Makefile +++ b/libs/bluez-libs/Makefile @@ -43,12 +43,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/bluetooth - $(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(STAGING_DIR)/usr/include/bluetooth - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/bluez.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include/bluetooth + $(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(1)/usr/include/bluetooth + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/bluez.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/bzip2/Makefile b/libs/bzip2/Makefile index 04a4a1eb4..c785c2282 100644 --- a/libs/bzip2/Makefile +++ b/libs/bzip2/Makefile @@ -35,10 +35,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_BUILD_DIR)/bzlib.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/bzlib.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libbz2.a $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/cgilib/Makefile b/libs/cgilib/Makefile index 5be5eecc1..b652be718 100644 --- a/libs/cgilib/Makefile +++ b/libs/cgilib/Makefile @@ -39,10 +39,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libcgi.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/cgi.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libcgi.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/clearsilver/Makefile b/libs/clearsilver/Makefile index f5cc23ea5..b2ecb32c0 100644 --- a/libs/clearsilver/Makefile +++ b/libs/clearsilver/Makefile @@ -44,50 +44,50 @@ MAKE_FLAGS += \ all install define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/ClearSilver - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/ClearSilver/cs - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/ClearSilver/cgi - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/ClearSilver/util - - $(CP) $(PKG_BUILD_DIR)/ClearSilver.h $(STAGING_DIR)/usr/include/ClearSilver/ - $(CP) $(PKG_BUILD_DIR)/cs_config.h $(STAGING_DIR)/usr/include/ClearSilver/ - - $(CP) $(PKG_BUILD_DIR)/cs/cs.h $(STAGING_DIR)/usr/include/ClearSilver/cs/ - - $(CP) $(PKG_BUILD_DIR)/cgi/cgi.h $(STAGING_DIR)/usr/include/ClearSilver/cgi/ - $(CP) $(PKG_BUILD_DIR)/cgi/cgiwrap.h $(STAGING_DIR)/usr/include/ClearSilver/cgi/ - $(CP) $(PKG_BUILD_DIR)/cgi/date.h $(STAGING_DIR)/usr/include/ClearSilver/cgi/ - $(CP) $(PKG_BUILD_DIR)/cgi/html.h $(STAGING_DIR)/usr/include/ClearSilver/cgi/ - - $(CP) $(PKG_BUILD_DIR)/util/neo_err.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_files.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_misc.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_rand.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/ulist.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_hdf.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_str.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_date.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/wildmat.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_hash.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/ulocks.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/rcfs.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/skiplist.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/dict.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/filter.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_net.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - $(CP) $(PKG_BUILD_DIR)/util/neo_server.h $(STAGING_DIR)/usr/include/ClearSilver/util/ - - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - - $(CP) $(PKG_BUILD_DIR)/libs/libneo_cs.a $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/libs/libneo_cgi.a $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/libs/libneo_utl.a $(STAGING_DIR)/usr/lib/ - - $(INSTALL_DIR) $(STAGING_DIR)/usr/bin - - $(CP) $(PKG_BUILD_DIR)/cs/cs $(STAGING_DIR)/usr/bin/ - $(CP) $(PKG_BUILD_DIR)/cs/cstest $(STAGING_DIR)/usr/bin/ - $(CP) $(PKG_BUILD_DIR)/cgi/cs_static.cgi $(STAGING_DIR)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/include/ClearSilver + $(INSTALL_DIR) $(1)/usr/include/ClearSilver/cs + $(INSTALL_DIR) $(1)/usr/include/ClearSilver/cgi + $(INSTALL_DIR) $(1)/usr/include/ClearSilver/util + + $(CP) $(PKG_BUILD_DIR)/ClearSilver.h $(1)/usr/include/ClearSilver/ + $(CP) $(PKG_BUILD_DIR)/cs_config.h $(1)/usr/include/ClearSilver/ + + $(CP) $(PKG_BUILD_DIR)/cs/cs.h $(1)/usr/include/ClearSilver/cs/ + + $(CP) $(PKG_BUILD_DIR)/cgi/cgi.h $(1)/usr/include/ClearSilver/cgi/ + $(CP) $(PKG_BUILD_DIR)/cgi/cgiwrap.h $(1)/usr/include/ClearSilver/cgi/ + $(CP) $(PKG_BUILD_DIR)/cgi/date.h $(1)/usr/include/ClearSilver/cgi/ + $(CP) $(PKG_BUILD_DIR)/cgi/html.h $(1)/usr/include/ClearSilver/cgi/ + + $(CP) $(PKG_BUILD_DIR)/util/neo_err.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_files.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_misc.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_rand.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/ulist.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_hdf.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_str.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_date.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/wildmat.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_hash.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/ulocks.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/rcfs.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/skiplist.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/dict.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/filter.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_net.h $(1)/usr/include/ClearSilver/util/ + $(CP) $(PKG_BUILD_DIR)/util/neo_server.h $(1)/usr/include/ClearSilver/util/ + + $(INSTALL_DIR) $(1)/usr/lib + + $(CP) $(PKG_BUILD_DIR)/libs/libneo_cs.a $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libs/libneo_cgi.a $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libs/libneo_utl.a $(1)/usr/lib/ + + $(INSTALL_DIR) $(1)/usr/bin + + $(CP) $(PKG_BUILD_DIR)/cs/cs $(1)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/cs/cstest $(1)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/cgi/cs_static.cgi $(1)/usr/bin/ endef define Build/UninstallDev diff --git a/libs/clinkc/Makefile b/libs/clinkc/Makefile index 732a6ff4e..536730d31 100644 --- a/libs/clinkc/Makefile +++ b/libs/clinkc/Makefile @@ -43,10 +43,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/cybergarage $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libclinkc.a $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/cybergarage $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libclinkc.a $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/curl/Makefile b/libs/curl/Makefile index 73bdee262..57ddeb0f6 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -83,16 +83,16 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_BUILD_DIR)/libcurl.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/bin/curl-config - $(SED) 's,$(TARGET_LDFLAGS),,g' $(STAGING_DIR)/usr/lib/pkgconfig/libcurl.pc + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config + $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/libcurl.pc endef define Build/UninstallDev diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile index 58df82ac9..7d561d952 100644 --- a/libs/cyrus-sasl/Makefile +++ b/libs/cyrus-sasl/Makefile @@ -87,14 +87,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/sasl $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.{a,so*} $(STAGING_DIR)/usr/lib/ - ln -sf libsasl2.a $(STAGING_DIR)/usr/lib/libsasl.a - ln -sf libsasl2.so $(STAGING_DIR)/usr/lib/libsasl.so - mkdir -p $(STAGING_DIR)/usr/lib/sasl2 - $(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(STAGING_DIR)/usr/lib/sasl2/ + mkdir -p $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/sasl $(1)/usr/include/ + mkdir -p $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.{a,so*} $(1)/usr/lib/ + ln -sf libsasl2.a $(1)/usr/lib/libsasl.a + ln -sf libsasl2.so $(1)/usr/lib/libsasl.so + mkdir -p $(1)/usr/lib/sasl2 + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(1)/usr/lib/sasl2/ endef define Build/UninstallDev diff --git a/libs/db/Makefile b/libs/db/Makefile index 56b993358..5cea27b36 100644 --- a/libs/db/Makefile +++ b/libs/db/Makefile @@ -87,10 +87,10 @@ define Package/libdb/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/db.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/db.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/dbus-glib/Makefile b/libs/dbus-glib/Makefile index a076290c3..77f4d2b76 100644 --- a/libs/dbus-glib/Makefile +++ b/libs/dbus-glib/Makefile @@ -51,16 +51,16 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/dbus-1.0/dbus + mkdir -p $(1)/usr/include/dbus-1.0/dbus $(CP) $(PKG_INSTALL_DIR)/usr/include/dbus-1.0/dbus/dbus-glib{,-error-enum,-lowlevel}.h \ $(PKG_INSTALL_DIR)/usr/include/dbus-1.0/dbus/dbus-gtype-specialized.h \ - $(STAGING_DIR)/usr/include//dbus-1.0/dbus/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include//dbus-1.0/dbus/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbus-glib-1.{a,so*} \ - $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig + $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-glib-1.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/ + $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/expat/Makefile b/libs/expat/Makefile index fecfb5d9c..ba47bf6aa 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -48,10 +48,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/expat{,_external}.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/expat{,_external}.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/fcgi/Makefile b/libs/fcgi/Makefile index ec5fe54cd..c76ba2554 100644 --- a/libs/fcgi/Makefile +++ b/libs/fcgi/Makefile @@ -53,11 +53,11 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/fcgi{app,_config,misc,o,os,_stdio}.h $(STAGING_DIR)/usr/include/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.{a,so*} $(STAGING_DIR)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/fcgi{app,_config,misc,o,os,_stdio}.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/file/Makefile b/libs/file/Makefile index 9feb901c9..11dea6f9c 100644 --- a/libs/file/Makefile +++ b/libs/file/Makefile @@ -57,10 +57,10 @@ MAKE_FLAGS += \ all install \ define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/magic.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmagic.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/magic.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmagic.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/flac/Makefile b/libs/flac/Makefile index 2e73f849c..fc257942f 100644 --- a/libs/flac/Makefile +++ b/libs/flac/Makefile @@ -39,10 +39,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_BUILD_DIR)/include/FLAC $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.{a,so} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/include/FLAC $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.{a,so} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index e2106e02b..88ddbf3c5 100644 --- a/libs/freetype/Makefile +++ b/libs/freetype/Makefile @@ -49,17 +49,17 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/ft2build.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$$includedir/freetype2,-I$(STAGING_DIR)/usr/include/freetype2,g' $(STAGING_DIR)/usr/bin/freetype-config - $(SED) 's,/usr/include/freetype2/,$(STAGING_DIR)/usr/include/freetype2/,g' $(STAGING_DIR)/usr/bin/freetype-config + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ft2build.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$$includedir/freetype2,-I$(1)/usr/include/freetype2,g' $(1)/usr/bin/freetype-config + $(SED) 's,/usr/include/freetype2/,$(1)/usr/include/freetype2/,g' $(1)/usr/bin/freetype-config endef define Build/UninstallDev diff --git a/libs/gd/Makefile b/libs/gd/Makefile index 781031159..28993af22 100644 --- a/libs/gd/Makefile +++ b/libs/gd/Makefile @@ -52,15 +52,15 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(STAGING_DIR)/usr/include/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/gd{,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx}.h \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/ - $(SED) 's,-I$$$${prefix}/include,,g' $(STAGING_DIR)/usr/bin/gdlib-config + $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(1)/usr/lib/ + $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/gdlib-config endef define Build/UninstallDev diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile index 97d927f65..d2edf6730 100644 --- a/libs/gdbm/Makefile +++ b/libs/gdbm/Makefile @@ -45,10 +45,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile index b0caee455..36deebf62 100644 --- a/libs/gettext/Makefile +++ b/libs/gettext/Makefile @@ -50,10 +50,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/lib/libintl/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(STAGING_DIR)/usr/lib/libintl/include/ - mkdir -p $(STAGING_DIR)/usr/lib/libintl/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(STAGING_DIR)/usr/lib/libintl/lib/ + mkdir -p $(1)/usr/lib/libintl/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/ + mkdir -p $(1)/usr/lib/libintl/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/ endef define Build/UninstallDev diff --git a/libs/glib/Makefile b/libs/glib/Makefile index 81b3efbb6..5a2207267 100644 --- a/libs/glib/Makefile +++ b/libs/glib/Makefile @@ -66,20 +66,20 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/glib $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$${prefix}/include/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(STAGING_DIR)/usr/bin/glib-config - $(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(STAGING_DIR)/usr/bin/glib-config - $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/bin/glib-config + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/glib $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${prefix}/include/glib,-I$(1)/usr/include/glib,g' $(1)/usr/bin/glib-config + $(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(1)/usr/lib/glib,g' $(1)/usr/bin/glib-config + $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/glib-config endef define Build/UninstallDev diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index c6112ee0a..3e95d333a 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -67,13 +67,13 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/glib-2.0 $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/glib-2.0 $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,object,thread}-2.0.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,module-no-export,object,thread}-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/glib-2.0 $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/glib-2.0 $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,object,thread}-2.0.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,module-no-export,object,thread}-2.0.pc $(1)/usr/lib/pkgconfig endef define Build/UninstallDev diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 2d28a7334..0154a5812 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -150,14 +150,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/gsm/Makefile b/libs/gsm/Makefile index 758dbee02..0e18cadf1 100644 --- a/libs/gsm/Makefile +++ b/libs/gsm/Makefile @@ -72,10 +72,10 @@ define Package/gsm-utils/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gsm.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/gsm.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/howl/Makefile b/libs/howl/Makefile index 618e4da7d..e584e3f19 100644 --- a/libs/howl/Makefile +++ b/libs/howl/Makefile @@ -95,14 +95,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I/usr/include,-I$$$${includedir},g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc - $(SED) 's,-L/usr/lib/howl,-L$$$${libdir}/howl,g' $(STAGING_DIR)/usr/lib/pkgconfig/howl.pc + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-I/usr/include,-I$$$${includedir},g' $(1)/usr/lib/pkgconfig/howl.pc + $(SED) 's,-L/usr/lib/howl,-L$$$${libdir}/howl,g' $(1)/usr/lib/pkgconfig/howl.pc endef define Build/UninstallDev diff --git a/libs/id3lib/Makefile b/libs/id3lib/Makefile index fe6bc2617..b44f7e0a4 100644 --- a/libs/id3lib/Makefile +++ b/libs/id3lib/Makefile @@ -46,12 +46,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/id3.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3.{a,so} $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3.{a,so} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/iksemel/Makefile b/libs/iksemel/Makefile index cd1313757..4e709c1c8 100644 --- a/libs/iksemel/Makefile +++ b/libs/iksemel/Makefile @@ -46,12 +46,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/iksemel.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiksemel.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/iksemel.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/iksemel.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiksemel.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/iksemel.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile index 62fd576b7..8cb964c19 100644 --- a/libs/jpeg/Makefile +++ b/libs/jpeg/Makefile @@ -72,12 +72,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_BUILD_DIR)/jpegint.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/jpegint.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libamsel/Makefile b/libs/libamsel/Makefile index 09291dc0e..c02cab051 100644 --- a/libs/libamsel/Makefile +++ b/libs/libamsel/Makefile @@ -41,12 +41,12 @@ MAKE_FLAGS += \ all install define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/include/compat - $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat/queue.h $(STAGING_DIR)/usr/include/compat/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libamsel.so $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat.h $(1)/usr/include/ + mkdir -p $(1)/usr/include/compat + $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat/queue.h $(1)/usr/include/compat/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libamsel.so $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libao/Makefile b/libs/libao/Makefile index e23ee9ae8..abb68bb19 100644 --- a/libs/libao/Makefile +++ b/libs/libao/Makefile @@ -51,12 +51,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libart/Makefile b/libs/libart/Makefile index 9fad21f56..3b8140925 100644 --- a/libs/libart/Makefile +++ b/libs/libart/Makefile @@ -50,14 +50,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libart-2.0 $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libart-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libart-2.0 $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libart-2.0.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile index 27743ba4b..c58fe3277 100644 --- a/libs/libaudiofile/Makefile +++ b/libs/libaudiofile/Makefile @@ -48,16 +48,16 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/af_vfs.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/audiofile.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/aupvlist.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/af_vfs.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/audiofile.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/aupvlist.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libbfd/Makefile b/libs/libbfd/Makefile index d9fc4e6e7..5ba1df118 100644 --- a/libs/libbfd/Makefile +++ b/libs/libbfd/Makefile @@ -43,14 +43,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/ansidecl.h \ $(PKG_INSTALL_DIR)/usr/include/bfd{,link}.h \ $(PKG_INSTALL_DIR)/usr/include/symcat.h \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbfd.a \ - $(STAGING_DIR)/usr/lib/ + $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libcli/Makefile b/libs/libcli/Makefile index 65af0baf3..b06692f14 100644 --- a/libs/libcli/Makefile +++ b/libs/libcli/Makefile @@ -41,10 +41,10 @@ MAKE_FLAGS += \ all install define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libcli.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libcli.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libdaemon/Makefile b/libs/libdaemon/Makefile index 69f14d7a8..d6e8b4d70 100644 --- a/libs/libdaemon/Makefile +++ b/libs/libdaemon/Makefile @@ -55,13 +55,13 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile index 3de6ed481..81bba217f 100644 --- a/libs/libdnet/Makefile +++ b/libs/libdnet/Makefile @@ -57,13 +57,13 @@ MAKE_FLAGS += \ all install define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libdvbpsi4/Makefile b/libs/libdvbpsi4/Makefile index 5ca58e57a..ba68344d7 100644 --- a/libs/libdvbpsi4/Makefile +++ b/libs/libdvbpsi4/Makefile @@ -40,10 +40,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/dvbpsi $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{a,so*,la} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/dvbpsi $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{a,so*,la} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libelf/Makefile b/libs/libelf/Makefile index 12512fb76..1404ccc83 100644 --- a/libs/libelf/Makefile +++ b/libs/libelf/Makefile @@ -44,12 +44,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libelf.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libelf* $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libelf.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libevent/Makefile b/libs/libevent/Makefile index bb6aea51c..ed45d91f0 100644 --- a/libs/libevent/Makefile +++ b/libs/libevent/Makefile @@ -49,11 +49,11 @@ MAKE_FLAGS += \ all install define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/event.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{a,so} $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/event.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{a,so} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile index 560a516f0..9830d84e6 100644 --- a/libs/libexif/Makefile +++ b/libs/libexif/Makefile @@ -46,10 +46,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libexif $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libexif $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexif*.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libffi-sable/Makefile b/libs/libffi-sable/Makefile index 5e014ddc8..0de76f766 100644 --- a/libs/libffi-sable/Makefile +++ b/libs/libffi-sable/Makefile @@ -49,10 +49,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index 0ec930c82..7dc66929e 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -53,14 +53,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/share/aclocal - $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(STAGING_DIR)/usr/share/aclocal/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/share/aclocal + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(1)/usr/share/aclocal/ endef define Build/UninstallDev diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 332c4817e..5b20c0e16 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -53,14 +53,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/share/aclocal - $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/share/aclocal + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(1)/usr/share/aclocal/ endef define Build/UninstallDev diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index 7cbc597e5..4b273d4d1 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -70,18 +70,18 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/gphoto2{,-port}-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gphoto2 $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port}.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgphoto2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$${prefix}/include/gphoto2,,g' $(STAGING_DIR)/usr/bin/gphoto2{,-port}-config - $(SED) 's,-I$$$${prefix}/include,,g' $(STAGING_DIR)/usr/bin/gphoto2{,-port}-config + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gphoto2{,-port}-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/gphoto2 $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgphoto2{,_port}.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgphoto2.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${prefix}/include/gphoto2,,g' $(1)/usr/bin/gphoto2{,-port}-config + $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/gphoto2{,-port}-config # remove annoying recursive symlink - rm -f $(STAGING_DIR)/usr/include/gphoto2/gphoto2 + rm -f $(1)/usr/include/gphoto2/gphoto2 endef define Build/UninstallDev diff --git a/libs/libgssapi/Makefile b/libs/libgssapi/Makefile index c15f76196..02fed6f15 100644 --- a/libs/libgssapi/Makefile +++ b/libs/libgssapi/Makefile @@ -35,12 +35,12 @@ MAKE_FLAGS += \ all install define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/gssglue/gssapi - $(CP) $(PKG_INSTALL_DIR)/usr/include/gssglue/gssapi/gssapi.h $(STAGING_DIR)/usr/include/gssglue/gssapi - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgssapi.{a,so*} $(STAGING_DIR)/usr/lib - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgssapi.pc $(STAGING_DIR)/usr/lib/pkgconfig + $(INSTALL_DIR) $(1)/usr/include/gssglue/gssapi + $(CP) $(PKG_INSTALL_DIR)/usr/include/gssglue/gssapi/gssapi.h $(1)/usr/include/gssglue/gssapi + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgssapi.{a,so*} $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libgssapi.pc $(1)/usr/lib/pkgconfig endef define Build/UninstallDev diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile index 997517c6e..d9fbb04ea 100644 --- a/libs/libiconv/Makefile +++ b/libs/libiconv/Makefile @@ -45,10 +45,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/lib/libiconv/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/lib/libiconv/include/ - mkdir -p $(STAGING_DIR)/usr/lib/libiconv/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(STAGING_DIR)/usr/lib/libiconv/lib/ + mkdir -p $(1)/usr/lib/libiconv/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(1)/usr/lib/libiconv/include/ + mkdir -p $(1)/usr/lib/libiconv/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(1)/usr/lib/libiconv/lib/ endef define Build/UninstallDev diff --git a/libs/libid3tag/Makefile b/libs/libid3tag/Makefile index 02ae3e369..1a352770b 100644 --- a/libs/libid3tag/Makefile +++ b/libs/libid3tag/Makefile @@ -49,10 +49,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile index 20ec2d6d4..c5768705c 100644 --- a/libs/libmad/Makefile +++ b/libs/libmad/Makefile @@ -59,10 +59,10 @@ MAKE_FLAGS += \ all install define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile index 2bb94bea7..f190010b4 100644 --- a/libs/libmcrypt/Makefile +++ b/libs/libmcrypt/Makefile @@ -46,14 +46,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/mcrypt.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(STAGING_DIR)/usr/bin/ - $(SED) 's,-I$$$${prefix}/include,,g' $(STAGING_DIR)/usr/bin/libmcrypt-config - $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/bin/libmcrypt-config + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/mcrypt.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(1)/usr/bin/ + $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libmcrypt-config + $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libmcrypt-config endef define Build/UninstallDev diff --git a/libs/libmpcdec/Makefile b/libs/libmpcdec/Makefile index ab4d09023..25228b88f 100644 --- a/libs/libmpcdec/Makefile +++ b/libs/libmpcdec/Makefile @@ -43,10 +43,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/mpcdec/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/mpcdec/* $(STAGING_DIR)/usr/include/mpcdec/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include/mpcdec/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/mpcdec/* $(1)/usr/include/mpcdec/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libmpd/Makefile b/libs/libmpd/Makefile index 673041da3..365a7ea92 100644 --- a/libs/libmpd/Makefile +++ b/libs/libmpd/Makefile @@ -33,12 +33,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libmpd $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpd.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpd.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libmpd $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpd.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpd.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile index 6b70b6577..6ca7ba95d 100644 --- a/libs/libnet-1.0.x/Makefile +++ b/libs/libnet-1.0.x/Makefile @@ -65,12 +65,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/lib/libnet-1.0.x/bin/ - mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/lib/libnet-1.0.x/include/ - mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.0.x/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/libnet-1.0.x/lib/ + mkdir -p $(1)/usr/lib/libnet-1.0.x/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.0.x/bin/ + mkdir -p $(1)/usr/lib/libnet-1.0.x/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.0.x/include/ + mkdir -p $(1)/usr/lib/libnet-1.0.x/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.0.x/lib/ endef define Build/UninstallDev diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile index b76e65141..4dc3758b1 100644 --- a/libs/libnet-1.1.x/Makefile +++ b/libs/libnet-1.1.x/Makefile @@ -65,12 +65,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.1.x/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/lib/libnet-1.1.x/bin/ - mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.1.x/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/lib/libnet-1.1.x/include/ - mkdir -p $(STAGING_DIR)/usr/lib/libnet-1.1.x/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/libnet-1.1.x/lib/ + mkdir -p $(1)/usr/lib/libnet-1.1.x/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(1)/usr/lib/libnet-1.1.x/bin/ + mkdir -p $(1)/usr/lib/libnet-1.1.x/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(1)/usr/lib/libnet-1.1.x/include/ + mkdir -p $(1)/usr/lib/libnet-1.1.x/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(1)/usr/lib/libnet-1.1.x/lib/ endef define Build/UninstallDev diff --git a/libs/libnfsidmap/Makefile b/libs/libnfsidmap/Makefile index 3ff78d4d5..392d1756e 100644 --- a/libs/libnfsidmap/Makefile +++ b/libs/libnfsidmap/Makefile @@ -35,12 +35,12 @@ MAKE_FLAGS += \ all install define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/nfsidmap.h $(STAGING_DIR)/usr/include/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfsidmap.{a,so*} $(STAGING_DIR)/usr/lib - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfsidmap.pc $(STAGING_DIR)/usr/lib/pkgconfig + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/nfsidmap.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfsidmap.{a,so*} $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfsidmap.pc $(1)/usr/lib/pkgconfig endef define Build/UninstallDev diff --git a/libs/libnids/Makefile b/libs/libnids/Makefile index 13650dbdd..73e93b650 100644 --- a/libs/libnids/Makefile +++ b/libs/libnids/Makefile @@ -53,10 +53,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/nids.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/nids.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libol/Makefile b/libs/libol/Makefile index 2f86625b0..ea43712f9 100644 --- a/libs/libol/Makefile +++ b/libs/libol/Makefile @@ -45,12 +45,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libol-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libol $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.{*a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libol-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libol $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.{*a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile index 4d579295a..b16fefd60 100644 --- a/libs/libosip2/Makefile +++ b/libs/libosip2/Makefile @@ -51,12 +51,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libpam/Makefile b/libs/libpam/Makefile index 524068be1..4bdb356d7 100644 --- a/libs/libpam/Makefile +++ b/libs/libpam/Makefile @@ -51,10 +51,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/lib/* $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include + mkdir -p $(1)/usr/lib $(1)/lib + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include endef define Build/UninstallDev diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index 0bd563997..d5aa61708 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -45,16 +45,16 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,^[ILR]_opts=".\+",,g' $(STAGING_DIR)/usr/bin/libpng*-config + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,^[ILR]_opts=".\+",,g' $(1)/usr/bin/libpng*-config endef define Build/UninstallDev diff --git a/libs/libreadline/Makefile b/libs/libreadline/Makefile index c86114162..861c75973 100644 --- a/libs/libreadline/Makefile +++ b/libs/libreadline/Makefile @@ -51,10 +51,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/librpcsecgss/Makefile b/libs/librpcsecgss/Makefile index 860c2e4e0..138e2a778 100644 --- a/libs/librpcsecgss/Makefile +++ b/libs/librpcsecgss/Makefile @@ -38,12 +38,12 @@ MAKE_FLAGS += \ all install define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/rpcsecgss/rpc - $(CP) $(PKG_INSTALL_DIR)/usr/include/rpcsecgss/rpc/*.h $(STAGING_DIR)/usr/include/rpcsecgss/rpc/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/librpcsecgss.{a,so*} $(STAGING_DIR)/usr/lib - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/librpcsecgss.pc $(STAGING_DIR)/usr/lib/pkgconfig + $(INSTALL_DIR) $(1)/usr/include/rpcsecgss/rpc + $(CP) $(PKG_INSTALL_DIR)/usr/include/rpcsecgss/rpc/*.h $(1)/usr/include/rpcsecgss/rpc/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librpcsecgss.{a,so*} $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/librpcsecgss.pc $(1)/usr/lib/pkgconfig endef define Build/UninstallDev diff --git a/libs/librsync/Makefile b/libs/librsync/Makefile index 59c8f9200..02de456ab 100644 --- a/libs/librsync/Makefile +++ b/libs/librsync/Makefile @@ -47,10 +47,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/librsync{,-config}.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/librsync.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/librsync{,-config}.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librsync.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libsamplerate/Makefile b/libs/libsamplerate/Makefile index 4648e563f..0387f8bdd 100644 --- a/libs/libsamplerate/Makefile +++ b/libs/libsamplerate/Makefile @@ -46,10 +46,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsamplerate.* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + mkdir -p $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsamplerate.* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libsigc++/Makefile b/libs/libsigc++/Makefile index ee1c47df0..83a4a9fc0 100644 --- a/libs/libsigc++/Makefile +++ b/libs/libsigc++/Makefile @@ -58,14 +58,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/sigc++-2.0 $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsigc-2.0.{a,so*} $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/sigc++-2.0 $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,$(TARGET_LDFLAGS),,g' $(STAGING_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/sigc++-2.0 $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsigc-2.0.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sigc++-2.0 $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sigc++-2.0.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/sigc++-2.0.pc endef define Build/UninstallDev diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile index 2ba589f3a..cbb314e48 100644 --- a/libs/libsndfile/Makefile +++ b/libs/libsndfile/Makefile @@ -40,12 +40,12 @@ MAKE_FLAGS += \ all install define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsndfile.* $(STAGING_DIR)/usr/lib/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/pkgconfig/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sndfile.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(INSTALL_DIR) $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsndfile.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sndfile.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile index 471e79908..d4af9a5f9 100644 --- a/libs/libtasn1/Makefile +++ b/libs/libtasn1/Makefile @@ -49,14 +49,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(STAGING_DIR)/usr/lib/ - $(SED) 's,-I$$$${prefix}/include,,g' $(STAGING_DIR)/usr/bin/libtasn1-config - $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/bin/libtasn1-config + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(1)/usr/lib/ + $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libtasn1-config + $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libtasn1-config endef define Build/UninstallDev diff --git a/libs/libtool/Makefile b/libs/libtool/Makefile index 4aad26e88..208dff62a 100644 --- a/libs/libtool/Makefile +++ b/libs/libtool/Makefile @@ -51,23 +51,23 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtool $(STAGING_DIR)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/share/ - $(CP) -R $(PKG_INSTALL_DIR)/usr/share/* $(STAGING_DIR)/usr/share/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtool $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(1)/usr/bin/ + mkdir -p $(1)/usr/share/ + $(CP) -R $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(1)/usr/include/ mkdir -p $(I_LIBLTDL_DEV)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/share/libtool - $(CP) $(PKG_INSTALL_DIR)/usr/share/libtool/config.guess $(STAGING_DIR)/usr/share/libtool/ - $(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib"|g' \ - $(STAGING_DIR)/usr/bin/libtool - $(SED) 's|^prefix=.*|prefix=$(STAGING_DIR)/usr|g' \ - $(STAGING_DIR)/usr/bin/libtoolize - $(SED) 's|^datadir=.*|datadir=$(STAGING_DIR)/usr/share|g' \ - $(STAGING_DIR)/usr/bin/libtoolize + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/share/libtool + $(CP) $(PKG_INSTALL_DIR)/usr/share/libtool/config.guess $(1)/usr/share/libtool/ + $(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(1)/usr/lib $(1)/lib"|g' \ + $(1)/usr/bin/libtool + $(SED) 's|^prefix=.*|prefix=$(1)/usr|g' \ + $(1)/usr/bin/libtoolize + $(SED) 's|^datadir=.*|datadir=$(1)/usr/share|g' \ + $(1)/usr/bin/libtoolize endef define Build/UninstallDev diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile index 256bafe0d..6a4db64b3 100644 --- a/libs/libtorrent/Makefile +++ b/libs/libtorrent/Makefile @@ -62,13 +62,13 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,$(TARGET_LDFLAGS),,g' $(STAGING_DIR)/usr/lib/pkgconfig/libtorrent.pc + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/torrent $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/libtorrent.pc endef define Build/UninstallDev diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index 2f25dcf23..29ab04cb0 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -49,12 +49,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/upnp $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/upnp $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile index 5fc4cd807..6883ea141 100644 --- a/libs/libusb/Makefile +++ b/libs/libusb/Makefile @@ -43,14 +43,14 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile index b32b8149e..6e21b10f9 100644 --- a/libs/libvorbisidec/Makefile +++ b/libs/libvorbisidec/Makefile @@ -48,10 +48,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index 01f0fa7fd..3de543ed0 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -81,16 +81,16 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$${includedir}/libxml2,-I$(STAGING_DIR)/usr/include/libxml2,g' $(STAGING_DIR)/usr/bin/xml2-config - $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir}/libxml2,-I$(1)/usr/include/libxml2,g' $(1)/usr/bin/xml2-config + $(SED) 's,-L$$$${libdir},,g' $(1)/usr/bin/xml2-config endef define Build/UninstallDev diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index f01b8d776..f89edad63 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -67,19 +67,19 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(STAGING_DIR)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libxslt $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xslt-config - $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xslt-config - $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xslt-config - $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xslt-config + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsltproc $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libxslt $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(1)/usr/lib/pkgconfig/ + $(SED) 's,-I$$$${includedir},,g' $(1)/usr/bin/xslt-config + $(SED) 's,-L$$$${libdir},,g' $(1)/usr/bin/xslt-config + $(SED) 's,-I$(1)/usr/include,,g' $(1)/usr/bin/xslt-config + $(SED) 's,-L$(1)/usr/lib,,g' $(1)/usr/bin/xslt-config endef define Build/UninstallDev diff --git a/libs/lzo/Makefile b/libs/lzo/Makefile index 5b6409281..25ff1f991 100644 --- a/libs/lzo/Makefile +++ b/libs/lzo/Makefile @@ -44,10 +44,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/lzo $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/lzo $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/matrixssl/Makefile b/libs/matrixssl/Makefile index 90c9d1807..214fa6670 100644 --- a/libs/matrixssl/Makefile +++ b/libs/matrixssl/Makefile @@ -39,11 +39,11 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/matrixSsl - $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl/ - ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl.h - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include/matrixSsl + $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(1)/usr/include/matrixSsl/ + ln -sf matrixSsl/matrixSsl.h $(1)/usr/include/matrixSsl.h + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile index b4824584c..891151118 100644 --- a/libs/mysql/Makefile +++ b/libs/mysql/Makefile @@ -95,15 +95,15 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(1)/usr/include/ # NOTE: needed for MySQL-Python - $(CP) $(PKG_BUILD_DIR)/include/mysqld_error.h $(STAGING_DIR)/usr/include/mysql/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/ - rm -f $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la + $(CP) $(PKG_BUILD_DIR)/include/mysqld_error.h $(1)/usr/include/mysql/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(1)/usr/lib/ + rm -f $(1)/usr/lib/mysql/libmysqlclient.la endef define Build/UninstallDev diff --git a/libs/neon/Makefile b/libs/neon/Makefile index c4f9c2ec1..787ada651 100644 --- a/libs/neon/Makefile +++ b/libs/neon/Makefile @@ -53,15 +53,15 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include/neon - $(CP) $(PKG_INSTALL_DIR)/usr/include/neon/* $(STAGING_DIR)/usr/include/neon/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/{libneon.a,libneon.la,libneon.so,libneon.so.26,libneon.so.26.0.3} $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/neon.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) "s,\=\/usr,\=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/neon-config - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libneon.la + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/neon-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include/neon + $(CP) $(PKG_INSTALL_DIR)/usr/include/neon/* $(1)/usr/include/neon/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/{libneon.a,libneon.la,libneon.so,libneon.so.26,libneon.so.26.0.3} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/neon.pc $(1)/usr/lib/pkgconfig/ + $(SED) "s,\=\/usr,\=$(1)/usr," $(1)/usr/bin/neon-config + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libneon.la endef define Build/UninstallDev diff --git a/libs/net-snmp/Makefile b/libs/net-snmp/Makefile index a17e2ca5e..d90dc1f48 100644 --- a/libs/net-snmp/Makefile +++ b/libs/net-snmp/Makefile @@ -253,12 +253,12 @@ define Package/snmp-utils/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/nmeap/Makefile b/libs/nmeap/Makefile index d0629e19d..2b48791ba 100644 --- a/libs/nmeap/Makefile +++ b/libs/nmeap/Makefile @@ -30,10 +30,10 @@ define Package/libnmeap endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/include - $(CP) $(PKG_BUILD_DIR)/inc/nmeap{,_def}.h $(STAGING_DIR)/usr/include/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/libnmeap.a $(STAGING_DIR)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/inc/nmeap{,_def}.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libnmeap.a $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/opencdk/Makefile b/libs/opencdk/Makefile index a7016c18f..d16ff2fb9 100644 --- a/libs/opencdk/Makefile +++ b/libs/opencdk/Makefile @@ -55,12 +55,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/opencdk.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/opencdk.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 1e8e215ce..602e166f1 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -86,10 +86,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile index 1089eb1e4..61187bc8d 100644 --- a/libs/pcre/Makefile +++ b/libs/pcre/Makefile @@ -39,12 +39,12 @@ MAKE_FLAGS += \ all define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/bin - $(CP) $(PKG_BUILD_DIR)/pcre-config $(STAGING_DIR)/usr/bin/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/include - $(CP) $(PKG_BUILD_DIR)/pcre{,posix}.h $(STAGING_DIR)/usr/include/ - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/pcre-config $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/pcre{,posix}.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/popt/Makefile b/libs/popt/Makefile index a021dfcba..ee378fa9e 100644 --- a/libs/popt/Makefile +++ b/libs/popt/Makefile @@ -43,10 +43,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 600cdd0ee..6c2362d9e 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -240,18 +240,18 @@ fi endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host $(STAGING_DIR)/usr/bin/pg_config - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host $(STAGING_DIR)/usr/bin/ecpg - $(CP) $(PKG_BUILD_DIR)/src/timezone/zic.host $(STAGING_DIR)/usr/bin/zic + mkdir -p $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host $(1)/usr/bin/pg_config + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/postgresql $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host $(1)/usr/bin/ecpg + $(CP) $(PKG_BUILD_DIR)/src/timezone/zic.host $(1)/usr/bin/zic endef define Build/UninstallDev diff --git a/libs/radiusclient-ng/Makefile b/libs/radiusclient-ng/Makefile index f752ae3db..8479e8616 100644 --- a/libs/radiusclient-ng/Makefile +++ b/libs/radiusclient-ng/Makefile @@ -72,10 +72,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/radiusclient-ng.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.{a,so}* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/radiusclient-ng.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.{a,so}* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/rrdtool-1.0.x/Makefile b/libs/rrdtool-1.0.x/Makefile index e3f9d2cde..de27f0dc0 100644 --- a/libs/rrdtool-1.0.x/Makefile +++ b/libs/rrdtool-1.0.x/Makefile @@ -151,10 +151,10 @@ define Package/librrd1/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile index bd9dbe558..98f556783 100644 --- a/libs/serdisplib/Makefile +++ b/libs/serdisplib/Makefile @@ -43,10 +43,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_BUILD_DIR)/include/serdisplib $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/include/serdisplib $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/speex/Makefile b/libs/speex/Makefile index b85257130..dd4377f8e 100644 --- a/libs/speex/Makefile +++ b/libs/speex/Makefile @@ -59,12 +59,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile index edd3edd33..189791c7f 100644 --- a/libs/sqlite2/Makefile +++ b/libs/sqlite2/Makefile @@ -77,12 +77,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile index 0d2cee9e1..7f97f7203 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -76,12 +76,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile index 49a3f280a..c354408a5 100644 --- a/libs/taglib/Makefile +++ b/libs/taglib/Makefile @@ -44,12 +44,12 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/taglib-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag.{a,so*} $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/include/taglib - $(CP) $(PKG_INSTALL_DIR)/usr/include/taglib/* $(STAGING_DIR)/usr/include/taglib/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/taglib-config $(1)/usr/bin/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtag.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/include/taglib + $(CP) $(PKG_INSTALL_DIR)/usr/include/taglib/* $(1)/usr/include/taglib/ endef define Build/UninstallDev diff --git a/libs/tcp_wrappers/Makefile b/libs/tcp_wrappers/Makefile index aaecd53e9..4ba57b724 100644 --- a/libs/tcp_wrappers/Makefile +++ b/libs/tcp_wrappers/Makefile @@ -46,11 +46,11 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_BUILD_DIR)/tcpd.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libwrap.a $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/tcpd.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libwrap.a $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 38cc1b295..85b68240a 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -45,10 +45,10 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/{lib,include} - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/ - $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libtif{f,fxx}.la + $(INSTALL_DIR) $(1)/usr/{lib,include} + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libtif{f,fxx}.la endef define Package/tiff/Install diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile index 7c0a5f506..4148f7b3a 100644 --- a/libs/uclibc++/Makefile +++ b/libs/uclibc++/Makefile @@ -65,19 +65,19 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include/uClibc++ - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/uClibc++/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(STAGING_DIR)/usr/lib/ - $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(STAGING_DIR)/usr/bin/g++-uc - $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(STAGING_DIR)/usr/bin/g++-uc + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(1)/usr/bin/ + mkdir -p $(1)/usr/include/uClibc++ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(1)/usr/lib/ + $(SED) 's|-I/include/|-I$(1)/usr/include/uClibc++/|g' $(1)/usr/bin/g++-uc + $(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(1)/usr/bin/g++-uc # add another wrapper which links against both uClibc++ and libstdc++ - $(CP) $(STAGING_DIR)/usr/bin/g++-uc $(STAGING_DIR)/usr/bin/g++-uc+std - $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(STAGING_DIR)/usr/bin/g++-uc+std - $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(STAGING_DIR)/usr/bin/g++-uc+std - $(SED) 's|-nostdinc++||g' $(STAGING_DIR)/usr/bin/g++-uc+std + $(CP) $(1)/usr/bin/g++-uc $(1)/usr/bin/g++-uc+std + $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(1)/usr/bin/g++-uc+std + $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(1)/usr/bin/g++-uc+std + $(SED) 's|-nostdinc++||g' $(1)/usr/bin/g++-uc+std endef define Build/UninstallDev diff --git a/libs/ustl/Makefile b/libs/ustl/Makefile index ae1a2647c..c9b9d5ed7 100644 --- a/libs/ustl/Makefile +++ b/libs/ustl/Makefile @@ -55,10 +55,10 @@ define Package/ustl/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/wxbase/Makefile b/libs/wxbase/Makefile index 57585f909..c10e136ea 100644 --- a/libs/wxbase/Makefile +++ b/libs/wxbase/Makefile @@ -113,16 +113,16 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) -L $(PKG_INSTALL_DIR)/usr/bin/wx-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.6 $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(STAGING_DIR)/usr/lib/ - $(SED) 's,-I$$$${includedir}/wx-2.6,-I$(STAGING_DIR)/usr/include/wx-2.6,g' $(STAGING_DIR)/usr/bin/wx-config - $(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(STAGING_DIR)/usr/bin/wx-config + mkdir -p $(1)/usr/bin + $(CP) -L $(PKG_INSTALL_DIR)/usr/bin/wx-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.6 $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6-*.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base{,_net,_xml}-2.6.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/ + $(SED) 's,-I$$$${includedir}/wx-2.6,-I$(1)/usr/include/wx-2.6,g' $(1)/usr/bin/wx-config + $(SED) 's,-I$$$${libdir}/wx/include,-I$(1)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config endef define Build/UninstallDev diff --git a/libs/xyssl/Makefile b/libs/xyssl/Makefile index 50faf516f..64275c3a5 100644 --- a/libs/xyssl/Makefile +++ b/libs/xyssl/Makefile @@ -57,10 +57,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/xyssl $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxyssl.{a,so} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/xyssl $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxyssl.{a,so} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/libs/zaptel/Makefile b/libs/zaptel/Makefile index 73cf7df5d..5c52ce324 100644 --- a/libs/zaptel/Makefile +++ b/libs/zaptel/Makefile @@ -49,11 +49,11 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/linux - $(CP) $(PKG_INSTALL_DIR)/usr/include/linux/zaptel.h $(STAGING_DIR)/usr/include/linux/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/tonezone.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include/linux + $(CP) $(PKG_INSTALL_DIR)/usr/include/linux/zaptel.h $(1)/usr/include/linux/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/tonezone.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtonezone.so* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/net/apache/Makefile b/net/apache/Makefile index ea395031a..4d075f162 100644 --- a/net/apache/Makefile +++ b/net/apache/Makefile @@ -105,21 +105,21 @@ define Build/InstallDev rm -rf $(PKG_INSTALL_DIR)/usr/man/ \ $(PKG_INSTALL_DIR)/usr/share/manual/ # if you need docs take a look into the build-dir :) - mkdir -p $(STAGING_DIR)/etc + mkdir -p $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/* \ - $(STAGING_DIR)/etc - mkdir -p $(STAGING_DIR)/usr/include + $(1)/etc + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/* \ - $(STAGING_DIR)/usr/include - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/httpd.exp \ - $(STAGING_DIR)/usr/lib - mkdir -p $(STAGING_DIR)/usr/sbin + $(1)/usr/lib + mkdir -p $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* \ - $(STAGING_DIR)/usr/sbin - mkdir -p $(STAGING_DIR)/usr/share + $(1)/usr/sbin + mkdir -p $(1)/usr/share $(CP) $(PKG_INSTALL_DIR)/usr/share/* \ - $(STAGING_DIR)/usr/share + $(1)/usr/share endef define Build/UninstallDev diff --git a/net/asterisk-1.4.x/Makefile b/net/asterisk-1.4.x/Makefile index afc17f77a..d255ac9c5 100644 --- a/net/asterisk-1.4.x/Makefile +++ b/net/asterisk-1.4.x/Makefile @@ -391,9 +391,9 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/asterisk/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(STAGING_DIR)/usr/include/asterisk/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(STAGING_DIR)/usr/include/ + mkdir -p $(1)/usr/include/asterisk/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/ endef diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index d048cd9d9..40f19946c 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -371,9 +371,9 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk \ - $(STAGING_DIR)/usr/include/ + $(1)/usr/include/ endef define Build/UninstallDev diff --git a/net/cups/Makefile b/net/cups/Makefile index 48cf22963..cef745a34 100644 --- a/net/cups/Makefile +++ b/net/cups/Makefile @@ -100,12 +100,12 @@ define Package/cups/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/ - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(1)/usr/bin/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile index 3f773c85d..b99c2d7c3 100644 --- a/net/gpsd/Makefile +++ b/net/gpsd/Makefile @@ -44,11 +44,11 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/sound/flite/Makefile b/sound/flite/Makefile index 481fadd0c..7161c8604 100644 --- a/sound/flite/Makefile +++ b/sound/flite/Makefile @@ -49,10 +49,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/flite - $(CP) $(PKG_INSTALL_DIR)/usr/include/flite/{cst,flite}*.h $(STAGING_DIR)/usr/include/flite/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflite*.so.* $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include/flite + $(CP) $(PKG_INSTALL_DIR)/usr/include/flite/{cst,flite}*.h $(1)/usr/include/flite/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libflite*.so.* $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/sound/lame/Makefile b/sound/lame/Makefile index 6810ea941..386125f5f 100644 --- a/sound/lame/Makefile +++ b/sound/lame/Makefile @@ -58,8 +58,8 @@ define Package/lame-lib/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/{lib,include} - ${CP} $(PKG_INSTALL_DIR)/usr/{lib,include} $(STAGING_DIR)/usr/ + mkdir -p $(1)/usr/{lib,include} + ${CP} $(PKG_INSTALL_DIR)/usr/{lib,include} $(1)/usr/ endef diff --git a/utils/apr-util/Makefile b/utils/apr-util/Makefile index f926b1f5a..4d2ce9cae 100644 --- a/utils/apr-util/Makefile +++ b/utils/apr-util/Makefile @@ -52,19 +52,19 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/bin + mkdir -p $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \ - $(STAGING_DIR)/usr/bin - mkdir -p $(STAGING_DIR)/usr/include/apr-1/ + $(1)/usr/bin + mkdir -p $(1)/usr/include/apr-1/ $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ - $(STAGING_DIR)/usr/include/apr-1/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include/apr-1/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/*aprutil* \ - $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/ + $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/ - $(SED) "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apu-1-config + $(1)/usr/lib/pkgconfig/ + $(SED) "s,\"/usr\",$(1)/usr," $(1)/usr/bin/apu-1-config endef define Build/UninstallDev diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 3858361f4..4ec21c039 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -90,17 +90,17 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include + mkdir -p $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/dbus-1.0 \ - $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib + $(1)/usr/include/ + mkdir -p $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.{a,so*} \ - $(STAGING_DIR)/usr/lib/ + $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 \ - $(STAGING_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig + $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-1.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/ + $(1)/usr/lib/pkgconfig/ endef define Build/UninstallDev diff --git a/utils/ntfs-3g/Makefile b/utils/ntfs-3g/Makefile index 931aab47a..635083529 100644 --- a/utils/ntfs-3g/Makefile +++ b/utils/ntfs-3g/Makefile @@ -47,10 +47,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/ntfs-3g $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ntfs-3g $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs-3g.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile index ec404aa4a..fa7e375c2 100644 --- a/utils/pciutils/Makefile +++ b/utils/pciutils/Makefile @@ -49,13 +49,13 @@ define Build/Compile endef define Build/InstallDev - $(INSTALL_DIR) $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/libpci.a $(STAGING_DIR)/usr/lib - $(INSTALL_DIR) $(STAGING_DIR)/usr/include/pci - $(CP) $(PKG_BUILD_DIR)/lib/pci.h $(STAGING_DIR)/usr/include/pci - $(CP) $(PKG_BUILD_DIR)/lib/config.h $(STAGING_DIR)/usr/include/pci - $(CP) $(PKG_BUILD_DIR)/lib/header.h $(STAGING_DIR)/usr/include/pci - $(CP) $(PKG_BUILD_DIR)/lib/types.h $(STAGING_DIR)/usr/include/pci + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libpci.a $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/include/pci + $(CP) $(PKG_BUILD_DIR)/lib/pci.h $(1)/usr/include/pci + $(CP) $(PKG_BUILD_DIR)/lib/config.h $(1)/usr/include/pci + $(CP) $(PKG_BUILD_DIR)/lib/header.h $(1)/usr/include/pci + $(CP) $(PKG_BUILD_DIR)/lib/types.h $(1)/usr/include/pci endef define Build/UninstallDev diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile index 7052be471..432548401 100644 --- a/utils/rrdtool/Makefile +++ b/utils/rrdtool/Makefile @@ -97,10 +97,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/include/ + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev diff --git a/utils/sysfsutils/Makefile b/utils/sysfsutils/Makefile index a921e5daf..58777a385 100644 --- a/utils/sysfsutils/Makefile +++ b/utils/sysfsutils/Makefile @@ -41,10 +41,10 @@ define Build/Compile endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/sysfs - $(CP) $(PKG_BUILD_DIR)/include/*.h $(STAGING_DIR)/usr/include/sysfs - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/lib/.libs/libsysfs.{a,so*} $(STAGING_DIR)/usr/lib/ + mkdir -p $(1)/usr/include/sysfs + $(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/sysfs + mkdir -p $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/.libs/libsysfs.{a,so*} $(1)/usr/lib/ endef define Build/UninstallDev