From: Lars-Peter Clausen Date: Sun, 4 Jan 2009 00:06:33 +0000 (+0000) Subject: Retain symlinks. $(INSTALL_*) copys the contens of a file, so if we want to keep... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=73630664440d34385d8ce5075767a70ecd772668;p=openwrt%2Fsvn-archive%2Fpackages.git Retain symlinks. $(INSTALL_*) copys the contens of a file, so if we want to keep symlinks either use $(CP) or create them manually. Fixes #4399 SVN-Revision: 13844 --- diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile index 01511b5ed..f455b45d8 100644 --- a/Xorg/lib/cairo/Makefile +++ b/Xorg/lib/cairo/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cairo PKG_VERSION:=1.8.6 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://cairographics.org/releases/ @@ -43,7 +43,7 @@ TARGET_CFLAGS+=-L$(STAGING_DIR)/usr/lib define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ $(INSTALL_DIR) $(1)/usr/include/cairo/ @@ -52,7 +52,7 @@ endef define Package/cairo/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,cairo)) diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile index d14496895..bdbfc4b09 100644 --- a/Xorg/lib/gtk2/Makefile +++ b/Xorg/lib/gtk2/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gtk2 PKG_VERSION:=2.14.4 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNOME/gtk+/2.14 @@ -70,7 +70,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/ - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ @@ -86,7 +86,7 @@ define Package/gtk2/install $(1)/etc/gtk-2.0/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ diff --git a/Xorg/lib/hippo-canvas/Makefile b/Xorg/lib/hippo-canvas/Makefile index fb031636e..39a4b878f 100644 --- a/Xorg/lib/hippo-canvas/Makefile +++ b/Xorg/lib/hippo-canvas/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hippo-canvas PKG_VERSION:=0.3.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/0.3/ @@ -62,8 +62,8 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ @@ -79,13 +79,13 @@ endef define Package/hippo-canvas/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef define Package/python-hippo-canvas/install $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/*.so* \ $(1)$(PYTHON_PKG_DIR) endef diff --git a/Xorg/lib/imlib2/Makefile b/Xorg/lib/imlib2/Makefile index 37e56018e..e1d04d96a 100644 --- a/Xorg/lib/imlib2/Makefile +++ b/Xorg/lib/imlib2/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=imlib2 PKG_VERSION:=1.4.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/enlightenment @@ -37,8 +37,8 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/* \ $(1)/usr/include/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{la,so*,a} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -56,7 +56,7 @@ endef define Package/imlib2/install $(INSTALL_DIR) $(1)/usr/lib/imlib2/{loaders,filters} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ diff --git a/Xorg/lib/libmatchbox/Makefile b/Xorg/lib/libmatchbox/Makefile index c58950ddd..6b91928f4 100644 --- a/Xorg/lib/libmatchbox/Makefile +++ b/Xorg/lib/libmatchbox/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmatchbox -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=1.9 PKG_SOURCE_URL:=http://matchbox-project.org/sources/libmatchbox/$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -47,7 +47,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/libmb/*.h \ $(1)/usr/include/libmb/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libmb.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -57,7 +57,7 @@ endef define Package/libmatchbox/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libmb.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/lib/librsvg/Makefile b/Xorg/lib/librsvg/Makefile index f445e20d5..38f3e7c2e 100644 --- a/Xorg/lib/librsvg/Makefile +++ b/Xorg/lib/librsvg/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=librsvg PKG_VERSION:=2.22.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22 @@ -63,7 +63,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ $(INSTALL_DIR) $(1)/usr/include/ @@ -72,13 +72,13 @@ endef define Package/librsvg/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef define Package/librsvg-pixbuf-loader/install $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/loaders - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/loaders/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/loaders/*.so* \ $(1)/usr/lib/gtk-2.0/2.10.0/loaders endef diff --git a/Xorg/lib/libxcb/Makefile b/Xorg/lib/libxcb/Makefile index 590bf26b0..25f98a362 100644 --- a/Xorg/lib/libxcb/Makefile +++ b/Xorg/lib/libxcb/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxcb PKG_VERSION:=1.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/ @@ -63,7 +63,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/xcb/* \ $(1)/usr/include/xcb/ - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ @@ -74,14 +74,14 @@ endef define Package/libxcb/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxcb.so* \ $(1)/usr/lib/ endef define Package/libxcb-xlib/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxcb-xlib.so* \ $(1)/usr/lib/ endef @@ -89,7 +89,7 @@ endef define Package/libxcb-proto/install/Default define Package/libxcb-$(1)/install $(INSTALL_DIR) $$(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxcb-$(1).so* \ $$(1)/usr/lib/ endef diff --git a/Xorg/lib/mesa/Makefile b/Xorg/lib/mesa/Makefile index 1af7d4517..a8472028d 100644 --- a/Xorg/lib/mesa/Makefile +++ b/Xorg/lib/mesa/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Mesa -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=7.2 PKG_SOURCE_URL:=@SF/mesa3d @@ -74,7 +74,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/GL/* \ $(1)/usr/include/GL - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib @@ -85,14 +85,14 @@ endef define Package/libgl-mesa/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libGL.so* \ $(1)/usr/lib/ endef define Package/libglu-mesa/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libGLU.so* \ $(1)/usr/lib/ endef @@ -100,7 +100,7 @@ endef define Package/libgl-mesa-dri/install/Default define Package/libgl-mesa-dri-$(1)/install $(INSTALL_DIR) $$(1)/usr/lib/dri/ - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/dri/$(1)_dri.so* \ $$(1)/usr/lib/dri endef diff --git a/Xorg/lib/pango/Makefile b/Xorg/lib/pango/Makefile index 9272fa706..ab26ef1da 100644 --- a/Xorg/lib/pango/Makefile +++ b/Xorg/lib/pango/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pango PKG_VERSION:=1.22.2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.22/ @@ -45,11 +45,11 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,lib/pango/1.6.0/modules,include} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.{so*,a,la} \ $(1)/usr/lib/pango/1.6.0/modules/ @@ -64,11 +64,11 @@ endef define Package/pango/install $(INSTALL_DIR) $(1)/usr/{lib/pango/1.6.0/modules,bin} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.so* \ $(1)/usr/lib/pango/1.6.0/modules/ diff --git a/Xorg/lib/pixman/Makefile b/Xorg/lib/pixman/Makefile index 96d14adb0..b59c45262 100644 --- a/Xorg/lib/pixman/Makefile +++ b/Xorg/lib/pixman/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=pixman PKG_NAME:=pixman -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=0.12.0 PKG_SOURCE_URL:=http://cairographics.org/releases/ @@ -42,7 +42,7 @@ endef define Package/pixman/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/lib/vte/Makefile b/Xorg/lib/vte/Makefile index 28f8e0ece..080d0a8cb 100644 --- a/Xorg/lib/vte/Makefile +++ b/Xorg/lib/vte/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vte PKG_VERSION:=0.17.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/0.17 @@ -70,7 +70,7 @@ define Build/InstallDev $(1)/usr/include/vte/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la,a} \ $(1)/usr/lib @@ -87,7 +87,7 @@ define Package/vte/install $(1)/usr/share/vte/termcap $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib @@ -99,12 +99,10 @@ endef define Package/python-vte/install $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.so* \ $(1)$(PYTHON_PKG_DIR)/gtk-2.0 endef $(eval $(call BuildPackage,vte)) $(eval $(call BuildPackage,python-vte)) - - diff --git a/Xorg/xorg/lib/libICE/Makefile b/Xorg/xorg/lib/libICE/Makefile index 87c7a4b94..0bb2c244b 100644 --- a/Xorg/xorg/lib/libICE/Makefile +++ b/Xorg/xorg/lib/libICE/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libICE -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -32,7 +32,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/ICE} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -45,7 +45,7 @@ endef define Package/libICE/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libSM/Makefile b/Xorg/xorg/lib/libSM/Makefile index 84a387675..c88dca9cf 100644 --- a/Xorg/xorg/lib/libSM/Makefile +++ b/Xorg/xorg/lib/libSM/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libSM PKG_NAME:=libSM -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -34,7 +34,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/SM} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -47,7 +47,7 @@ endef define Package/libSM/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libX11/Makefile b/Xorg/xorg/lib/libX11/Makefile index 08290e5b5..10cd0e503 100644 --- a/Xorg/xorg/lib/libX11/Makefile +++ b/Xorg/xorg/lib/libX11/Makefile @@ -8,9 +8,8 @@ include $(TOPDIR)/rules.mk -PKG_BASE_NAME:=libX11 PKG_NAME:=libX11 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.1.5 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -51,7 +50,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la,a} \ $(1)/usr/lib/ @@ -66,7 +65,7 @@ endef define Package/libX11/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXau/Makefile b/Xorg/xorg/lib/libXau/Makefile index 1bacb9c6f..a73b1216f 100644 --- a/Xorg/xorg/lib/libXau/Makefile +++ b/Xorg/xorg/lib/libXau/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libXau PKG_NAME:=libXau -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -46,7 +46,7 @@ endef define Package/libXau/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXaw/Makefile b/Xorg/xorg/lib/libXaw/Makefile index 795db953d..5efd27617 100644 --- a/Xorg/xorg/lib/libXaw/Makefile +++ b/Xorg/xorg/lib/libXaw/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXaw -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -40,7 +40,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xaw} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -58,7 +58,7 @@ endef define Package/libXaw/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXcomposite/Makefile b/Xorg/xorg/lib/libXcomposite/Makefile index 7f42f1ac1..29a965eab 100644 --- a/Xorg/xorg/lib/libXcomposite/Makefile +++ b/Xorg/xorg/lib/libXcomposite/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXcomposite -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=0.4.0 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -46,7 +46,7 @@ endef define Package/libXcomposite/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXcursor/Makefile b/Xorg/xorg/lib/libXcursor/Makefile index 277c92ef8..60aef1de2 100644 --- a/Xorg/xorg/lib/libXcursor/Makefile +++ b/Xorg/xorg/lib/libXcursor/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXcursor -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.1.9 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xcursor} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -46,7 +46,7 @@ endef define Package/libXcursor/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXdamage/Makefile b/Xorg/xorg/lib/libXdamage/Makefile index c0f715bc1..ae98089bf 100644 --- a/Xorg/xorg/lib/libXdamage/Makefile +++ b/Xorg/xorg/lib/libXdamage/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXdamage -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=1.1.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -34,7 +34,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -47,7 +47,7 @@ endef define Package/libXdamage/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXdmcp/Makefile b/Xorg/xorg/lib/libXdmcp/Makefile index e96cf04b3..19082bd77 100644 --- a/Xorg/xorg/lib/libXdmcp/Makefile +++ b/Xorg/xorg/lib/libXdmcp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXdmcp -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.2 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -32,7 +32,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -45,7 +45,7 @@ endef define Package/libXdmcp/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXext/Makefile b/Xorg/xorg/lib/libXext/Makefile index 8d532a824..b71f930e0 100644 --- a/Xorg/xorg/lib/libXext/Makefile +++ b/Xorg/xorg/lib/libXext/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXext -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -39,7 +39,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -49,7 +49,7 @@ endef define Package/libXext/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXfixes/Makefile b/Xorg/xorg/lib/libXfixes/Makefile index e7fe97b29..fe07432b6 100644 --- a/Xorg/xorg/lib/libXfixes/Makefile +++ b/Xorg/xorg/lib/libXfixes/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXfixes -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=4.0.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -46,7 +46,7 @@ endef define Package/libXfixes/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXfont/Makefile b/Xorg/xorg/lib/libXfont/Makefile index ebcbc5258..51ef83ffb 100644 --- a/Xorg/xorg/lib/libXfont/Makefile +++ b/Xorg/xorg/lib/libXfont/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXfont -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.3.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -46,7 +46,7 @@ endef define Package/libXfont/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXft/Makefile b/Xorg/xorg/lib/libXft/Makefile index ab1ef82ea..8899a3aa0 100644 --- a/Xorg/xorg/lib/libXft/Makefile +++ b/Xorg/xorg/lib/libXft/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXft -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=2.1.13 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -32,7 +32,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xft} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -45,7 +45,7 @@ endef define Package/libXft/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXi/Makefile b/Xorg/xorg/lib/libXi/Makefile index 28850882b..68b806cec 100644 --- a/Xorg/xorg/lib/libXi/Makefile +++ b/Xorg/xorg/lib/libXi/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXi -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=1.1.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -36,14 +36,14 @@ endef define Package/libXi/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libXi.so* \ $(1)/usr/lib/ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libXi.{so*,a,la} \ $(1)/usr/lib/ diff --git a/Xorg/xorg/lib/libXmu/Makefile b/Xorg/xorg/lib/libXmu/Makefile index b9b3b6142..2f1fbabbd 100644 --- a/Xorg/xorg/lib/libXmu/Makefile +++ b/Xorg/xorg/lib/libXmu/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXmu -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -43,7 +43,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xmu} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -56,14 +56,14 @@ endef define Package/libXmu/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libXmu.so* \ $(1)/usr/lib/ endef define Package/libXmuu/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libXmuu.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXpm/Makefile b/Xorg/xorg/lib/libXpm/Makefile index 92f83a00c..d7d12a9aa 100644 --- a/Xorg/xorg/lib/libXpm/Makefile +++ b/Xorg/xorg/lib/libXpm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXpm -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=3.5.7 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -46,7 +46,7 @@ endef define Package/libXpm/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXrandr/Makefile b/Xorg/xorg/lib/libXrandr/Makefile index cb832482c..28f284d37 100644 --- a/Xorg/xorg/lib/libXrandr/Makefile +++ b/Xorg/xorg/lib/libXrandr/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXrandr -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.2.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -39,7 +39,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -52,7 +52,7 @@ endef define Package/libXrandr/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXrender/Makefile b/Xorg/xorg/lib/libXrender/Makefile index 5c7cf6932..2e1539ca9 100644 --- a/Xorg/xorg/lib/libXrender/Makefile +++ b/Xorg/xorg/lib/libXrender/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXrender -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=0.9.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -39,7 +39,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -52,7 +52,7 @@ endef define Package/libXrender/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXt/Makefile b/Xorg/xorg/lib/libXt/Makefile index d5566996b..e39efd601 100644 --- a/Xorg/xorg/lib/libXt/Makefile +++ b/Xorg/xorg/lib/libXt/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXt -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.5 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -45,7 +45,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -58,7 +58,7 @@ endef define Package/libXt/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXtst/Makefile b/Xorg/xorg/lib/libXtst/Makefile index 8a427a0b2..3f1ed3067 100644 --- a/Xorg/xorg/lib/libXtst/Makefile +++ b/Xorg/xorg/lib/libXtst/Makefile @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -43,7 +43,7 @@ endef define Package/libXtst/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXv/Makefile b/Xorg/xorg/lib/libXv/Makefile index 594e399a0..3aa04734f 100644 --- a/Xorg/xorg/lib/libXv/Makefile +++ b/Xorg/xorg/lib/libXv/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXv -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -39,7 +39,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -52,7 +52,7 @@ endef define Package/libXv/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXvMC/Makefile b/Xorg/xorg/lib/libXvMC/Makefile index 2b68d108d..436c536be 100644 --- a/Xorg/xorg/lib/libXvMC/Makefile +++ b/Xorg/xorg/lib/libXvMC/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXvMC -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -39,7 +39,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -52,7 +52,7 @@ endef define Package/libXvMC/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXxf86misc/Makefile b/Xorg/xorg/lib/libXxf86misc/Makefile index 4cde838c9..74f348382 100644 --- a/Xorg/xorg/lib/libXxf86misc/Makefile +++ b/Xorg/xorg/lib/libXxf86misc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXxf86misc -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -39,7 +39,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -49,7 +49,7 @@ endef define Package/libXxf86misc/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libXxf86vm/Makefile b/Xorg/xorg/lib/libXxf86vm/Makefile index 40acdbaa7..4e9dc6e27 100644 --- a/Xorg/xorg/lib/libXxf86vm/Makefile +++ b/Xorg/xorg/lib/libXxf86vm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libXxf86vm -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.2 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -39,7 +39,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -49,7 +49,7 @@ endef define Package/libXxf86vm/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libfontenc/Makefile b/Xorg/xorg/lib/libfontenc/Makefile index 8edc0e2f6..fc7cd5d0e 100644 --- a/Xorg/xorg/lib/libfontenc/Makefile +++ b/Xorg/xorg/lib/libfontenc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfontenc -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.4 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -46,7 +46,7 @@ endef define Package/libfontenc/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libpciaccess/Makefile b/Xorg/xorg/lib/libpciaccess/Makefile index 29eb47aea..a4303479c 100644 --- a/Xorg/xorg/lib/libpciaccess/Makefile +++ b/Xorg/xorg/lib/libpciaccess/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_BASE_NAME:=libpciaccess PKG_NAME:=libpciaccess -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=0.10.3 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -49,7 +49,7 @@ define Build/InstallDev $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libpciaccess.{so*,a,la} \ $(1)/usr/lib/ @@ -60,7 +60,7 @@ endef define Package/libpciaccess/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libpciaccess.so* \ $(1)/usr/lib/ endef diff --git a/Xorg/xorg/lib/libxkbfile/Makefile b/Xorg/xorg/lib/libxkbfile/Makefile index 7eaebe919..43572d8e4 100644 --- a/Xorg/xorg/lib/libxkbfile/Makefile +++ b/Xorg/xorg/lib/libxkbfile/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxkbfile -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_VERSION:=1.0.5 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ @@ -33,7 +33,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -46,7 +46,7 @@ endef define Package/libxkbfile/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile index 1cc87fe6a..d80710171 100644 --- a/libs/axtls/Makefile +++ b/libs/axtls/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=axtls PKG_VERSION:=1.1.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=axTLS-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/axtls http://www.leroc.com.au/axTLS/ @@ -63,7 +63,7 @@ endef define Package/libaxtls/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaxtls.so.* $(1)/usr/lib/ endef define Package/axhttpd/install diff --git a/libs/dbus-glib/Makefile b/libs/dbus-glib/Makefile index 2b208ed97..6413a6311 100644 --- a/libs/dbus-glib/Makefile +++ b/libs/dbus-glib/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus-glib PKG_VERSION:=0.76 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus-glib/ @@ -53,8 +53,8 @@ define Build/InstallDev $(1)/usr/include/dbus-1.0/dbus/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libdbus-glib-1.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libdbus-glib-1.{la,a,so*} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -65,7 +65,7 @@ endef define Package/libdbus-glib/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdbus-glib-1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbus-glib-1.so.* $(1)/usr/lib/ endef diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile index 3686c3168..fd6fa9afd 100644 --- a/libs/gettext/Makefile +++ b/libs/gettext/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gettext PKG_VERSION:=0.16.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gettext @@ -50,16 +50,16 @@ define Build/Install $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install endef -define Build/InstallDev +define Build/InstallDev mkdir -p $(1)/usr/lib/libintl/include $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl/include/ mkdir -p $(1)/usr/lib/libintl/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl/lib/ endef define Package/libintl/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libintl)) diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index bb077428a..66dd11315 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 PKG_VERSION:=2.18.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=glib-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) @@ -83,8 +83,8 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/lib/glib-2.0 \ $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -105,7 +105,7 @@ endef define Package/glib2/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/libs/gsm/Makefile b/libs/gsm/Makefile index 60274ff05..273ae3ec9 100644 --- a/libs/gsm/Makefile +++ b/libs/gsm/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gsm PKG_VERSION:=1.0.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.0-pl10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -73,7 +73,8 @@ endef define Package/gsm-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/toast $(1)/usr/bin/ + (cd $(1)/usr/bin; ln -s toast untoast; ln -s toast tcat) endef define Build/InstallDev diff --git a/libs/libIDL2/Makefile b/libs/libIDL2/Makefile index 52b8f6c8c..26e757f1d 100644 --- a/libs/libIDL2/Makefile +++ b/libs/libIDL2/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libIDL2 PKG_VERSION:=0.8.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=libIDL-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(BUILD_DIR)/libIDL-$(PKG_VERSION) @@ -62,8 +62,8 @@ define Build/InstallDev $(1)/usr/include/libIDL-2.0/libIDL/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -74,8 +74,8 @@ endef define Package/libIDL2/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ endef diff --git a/libs/libaio/Makefile b/libs/libaio/Makefile index 0137b40e5..dc910bdb2 100644 --- a/libs/libaio/Makefile +++ b/libs/libaio/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libaio PKG_VERSION:=0.3.106 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/liba/libaio/ @@ -56,7 +56,7 @@ endef define Package/libaio/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/libaio.so.* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/src/libaio.so.* $(1)/usr/lib/ ln -sf libaio.so.$(LIBAIO_SOVER) $(1)/usr/lib/libaio.so ln -sf libaio.so.$(LIBAIO_SOVER) $(1)/usr/lib/libaio.so.1 endef diff --git a/libs/libart/Makefile b/libs/libart/Makefile index f87a48a1b..6ab532f70 100644 --- a/libs/libart/Makefile +++ b/libs/libart/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libart PKG_VERSION:=2.3.20 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)_lgpl-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)_lgpl/2.3 @@ -64,8 +64,8 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/libart-2.0 \ $(1)/usr/include/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{la,a,so*} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -75,7 +75,7 @@ endef define Package/libart/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libart)) diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile index cb034f5d9..a13965da7 100644 --- a/libs/libaudiofile/Makefile +++ b/libs/libaudiofile/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libaudiofile PKG_VERSION:=0.2.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast @@ -59,8 +59,8 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.{la,a,so*} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -71,7 +71,7 @@ endef define Package/libaudiofile/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* \ $(1)/usr/lib/ endef diff --git a/libs/libdnet/Makefile b/libs/libdnet/Makefile index 12c1af28a..394f8ce70 100644 --- a/libs/libdnet/Makefile +++ b/libs/libdnet/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdnet PKG_VERSION:=1.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -77,14 +77,14 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libdnet.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libdnet.{la,a,so*} \ $(1)/usr/lib/ endef define Package/libdnet/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* \ $(1)/usr/lib/ diff --git a/libs/libdvbpsi4/Makefile b/libs/libdvbpsi4/Makefile index b2cd823f4..4a8766328 100644 --- a/libs/libdvbpsi4/Makefile +++ b/libs/libdvbpsi4/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdvbpsi4 PKG_VERSION:=0.1.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://download.videolan.org/pub/libdvbpsi/$(PKG_VERSION)/ @@ -41,14 +41,14 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/dvbpsi/*.h \ $(1)/usr/include/dvbpsi/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{so*,a,la} \ $(1)/usr/lib/ endef define Package/libdvbpsi4/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.so* \ $(1)/usr/lib/ endef diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 416a922f8..4b4eb80c7 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgpg-error PKG_VERSION:=1.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \ @@ -65,8 +65,8 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{la,a,so*} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/share/aclocal @@ -77,7 +77,7 @@ endef define Package/libgpg-error/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* \ $(1)/usr/lib/ endef diff --git a/libs/libmpcdec/Makefile b/libs/libmpcdec/Makefile index 1763ad64b..7099106f4 100644 --- a/libs/libmpcdec/Makefile +++ b/libs/libmpcdec/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmpcdec PKG_VERSION:=1.2.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://files.musepack.net/source/ @@ -41,15 +41,15 @@ define Build/InstallDev $(1)/usr/include/mpcdec/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ endef define Package/libmpcdec/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libmpcdec.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libmpcdec.so* \ $(1)/usr/lib/ endef diff --git a/libs/libmpd/Makefile b/libs/libmpd/Makefile index 24fee43b4..683b89b6c 100644 --- a/libs/libmpd/Makefile +++ b/libs/libmpd/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmpd PKG_VERSION:=0.14.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.neophob.com/files/owrt/ @@ -48,7 +48,7 @@ endef define Package/libmpd/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libmpd.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpd.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libmpd)) diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile index 46d973447..af40e9546 100644 --- a/libs/libnetfilter-queue/Makefile +++ b/libs/libnetfilter-queue/Makefile @@ -56,8 +56,8 @@ define Build/InstallDev $(1)/usr/include/libnetfilter_queue/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -68,7 +68,7 @@ endef define Package/libnetfilter-queue/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.{so*,a} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetfilter_queue*.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libnetfilter-queue)) diff --git a/libs/libogg/Makefile b/libs/libogg/Makefile index f3ca350fc..800302c41 100644 --- a/libs/libogg/Makefile +++ b/libs/libogg/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libogg PKG_VERSION:=1.1.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ogg/ PKG_FIXUP:=libtool @@ -39,7 +39,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/ogg/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/ogg/* $(1)/usr/include/ogg/ $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ $(INSTALL_DIR) $(1)/usr/share/aclocal/ @@ -48,7 +48,7 @@ endef define Package/libogg/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libogg)) diff --git a/libs/libtheora/Makefile b/libs/libtheora/Makefile index ccc121355..a88d6890b 100644 --- a/libs/libtheora/Makefile +++ b/libs/libtheora/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtheora PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/ PKG_MD5SUM:=c963937053f45a7878954bed37ceb182 @@ -50,14 +50,14 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/theora/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/theora/* $(1)/usr/include/theora/ $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef define Package/libtheora/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libtheora)) diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile index a185070aa..4a88d9edf 100644 --- a/libs/libusb/Makefile +++ b/libs/libusb/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libusb PKG_VERSION:=0.1.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/libusb @@ -52,7 +52,7 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libusb*.{la,so*,a} \ $(1)/usr/lib/ @@ -64,7 +64,7 @@ endef define Package/libusb/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libusb*.so* \ $(1)/usr/lib/ endef diff --git a/libs/libvorbis/Makefile b/libs/libvorbis/Makefile index 6aabc87b8..226c85f5d 100644 --- a/libs/libvorbis/Makefile +++ b/libs/libvorbis/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libvorbis PKG_VERSION:=1.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/ PKG_MD5SUM:=478646358c49f34aedcce58948793619 @@ -49,7 +49,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/vorbis/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/vorbis/* $(1)/usr/include/vorbis/ $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ $(INSTALL_DIR) $(1)/usr/share/aclocal/ @@ -58,7 +58,7 @@ endef define Package/libvorbis/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libvorbis)) diff --git a/libs/libxapian/Makefile b/libs/libxapian/Makefile index dc1b02df0..02964bea0 100644 --- a/libs/libxapian/Makefile +++ b/libs/libxapian/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xapian-core PKG_VERSION:=1.0.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://oligarchy.co.uk/xapian/$(PKG_VERSION) @@ -49,8 +49,8 @@ define Build/InstallDev $(1)/usr/include/xapian $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DIR) $(2)/bin $(INSTALL_BIN) \ @@ -66,8 +66,8 @@ endef define Package/libxapian/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) \ @@ -76,5 +76,3 @@ define Package/libxapian/install endef $(eval $(call BuildPackage,libxapian)) - - diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index 0f27a5129..3add8aa9b 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxml2 PKG_VERSION:=2.7.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \ @@ -78,8 +78,8 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libxml2.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libxml2.{la,a,so*} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -95,7 +95,7 @@ endef define Package/libxml2/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* \ $(1)/usr/lib/ endef diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 9e9645e91..7074ea398 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libxslt PKG_VERSION:=1.1.24 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \ @@ -78,8 +78,8 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/libxslt/* \ $(1)/usr/include/libxslt/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libxslt.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libxslt.{la,a,so*} \ $(1)/usr/lib/ $(INSTALL_DATA) \ @@ -93,7 +93,7 @@ endef define Package/libxslt/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* \ $(1)/usr/lib/ endef diff --git a/libs/opencdk/Makefile b/libs/opencdk/Makefile index 0bbb67d9f..78d2e514e 100644 --- a/libs/opencdk/Makefile +++ b/libs/opencdk/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opencdk PKG_VERSION:=0.6.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/opencdk/ \ @@ -66,14 +66,14 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{la,so*} \ $(1)/usr/lib/ endef define Package/libopencdk/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* \ $(1)/usr/lib/ endef diff --git a/libs/ossp-js/Makefile b/libs/ossp-js/Makefile index bb289d3da..ae343d2d9 100644 --- a/libs/ossp-js/Makefile +++ b/libs/ossp-js/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=js PKG_VERSION:=1.6.20070208 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.ossp.org/pkg/lib/js/ @@ -91,7 +91,7 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libjs.{la,so*} \ $(1)/usr/lib/ @@ -110,7 +110,7 @@ endef define Package/libjs/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libjs.so.* \ $(1)/usr/lib/ endef diff --git a/libs/taglib/Makefile b/libs/taglib/Makefile index d940166b5..dba493b73 100644 --- a/libs/taglib/Makefile +++ b/libs/taglib/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=taglib PKG_VERSION:=1.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://developer.kde.org/~wheeler/files/src/ @@ -52,8 +52,8 @@ define Build/InstallDev $(2)/bin/taglib-config $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/libtag.{la,so*} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libtag.{la,a,so*} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/include/taglib $(INSTALL_DATA) \ diff --git a/libs/wnck/Makefile b/libs/wnck/Makefile index 85a7f9893..21b300153 100644 --- a/libs/wnck/Makefile +++ b/libs/wnck/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwnck PKG_VERSION:=2.22.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22/ @@ -47,14 +47,14 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/libwnck-1.0/libwnck/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libwnck-1.0/libwnck/* $(1)/usr/include/libwnck-1.0/libwnck/ $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*{.so*,la} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*{.so*,a,la} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef define Package/libwnck/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*{.so*,a} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libwnck)) diff --git a/multimedia/gst-plugins-base/Makefile b/multimedia/gst-plugins-base/Makefile index 1e9743c65..316726c46 100644 --- a/multimedia/gst-plugins-base/Makefile +++ b/multimedia/gst-plugins-base/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst-plugins-base PKG_VERSION:=0.10.21 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-base/ @@ -67,13 +67,13 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/gstreamer-0.10 - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,a,la} \ $(1)/usr/lib/gstreamer-0.10/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ @@ -84,13 +84,13 @@ endef define Package/gst-plugins-base/install $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/gstreamer-0.10 - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.so* \ $(1)/usr/lib/gstreamer-0.10 endef diff --git a/multimedia/gst-plugins-good/Makefile b/multimedia/gst-plugins-good/Makefile index 053c03e64..42a647efc 100644 --- a/multimedia/gst-plugins-good/Makefile +++ b/multimedia/gst-plugins-good/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst-plugins-good PKG_VERSION:=0.10.10 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-good/ @@ -75,15 +75,15 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/gstreamer-0.10 - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,a,la} \ $(1)/usr/lib/gstreamer-0.10 endef define Package/gst-plugins-good/install $(INSTALL_DIR) $(1)/usr/lib/gstreamer-0.10 - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.so* \ $(1)/usr/lib/gstreamer-0.10 endef diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 706034802..198792907 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer PKG_VERSION:=0.10.21 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/ @@ -61,13 +61,13 @@ define Build/InstallDev $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/gstreamer-0.10/ $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,la} \ + $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,a,la} \ $(1)/usr/lib/gstreamer-0.10 $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ @@ -86,13 +86,13 @@ define Package/gstreamer/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/gstreamer-0.10/ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.{so*,a} \ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/gstreamer-0.10/*.so* \ $(1)/usr/lib/gstreamer-0.10 endef diff --git a/net/cups/Makefile b/net/cups/Makefile index 21238d418..38bf50c90 100644 --- a/net/cups/Makefile +++ b/net/cups/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cups PKG_VERSION:=1.3.7 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 PKG_SOURCE_URL:= \ @@ -96,7 +96,10 @@ define Package/cups/install $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/*.css $(1)/usr/share/doc/cups/ $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(1)/usr/share/doc/cups/ $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/sbin/{accept,cupsaddsmb,cupsctl,cupsd,cupsfilter,lpadmin,lpc,lpinfo,lpmove} \ + $(1)/usr/sbin/ + (cd $(1)/usr/sbin; ln -s accept reject; ln -s accept cupsenable; ln -s accept cupsdisable;) # overwrite default config with our own $(CP) ./files/etc/cups/* $(1)/etc/cups/ # install initscript with priority 60 diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile index 29f396bc8..1871fbf42 100644 --- a/net/gpsd/Makefile +++ b/net/gpsd/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpsd PKG_VERSION:=2.37 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.berlios.de/gpsd/ @@ -65,7 +65,7 @@ endef define Package/gpsd/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(1)/usr/sbin/ endef diff --git a/net/nfs-utils/Makefile b/net/nfs-utils/Makefile index ad57cd543..c915fb3ba 100644 --- a/net/nfs-utils/Makefile +++ b/net/nfs-utils/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfs-utils PKG_VERSION:=1.1.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.sourceforge.net/nfs/ @@ -51,7 +51,8 @@ endef define Package/nfs-utils/install $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount* $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.nfs $(1)/sbin/ + (cd $(1)/sbin; ln -s mount.nfs mount.nfs4; ln mount.nfs umount.nfs; ln -s mount.nfs umount.nfs4) endef $(eval $(call BuildPackage,nfs-utils)) diff --git a/net/openslp/Makefile b/net/openslp/Makefile index dcccbe5ed..101802a8e 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openslp PKG_VERSION:=1.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/openslp/ @@ -35,7 +35,7 @@ define Package/openslp/install $(INSTALL_DIR) $(1)/etc $(1)/lib $(1)/usr/bin $(1)/etc/init.d $(INSTALL_BIN) $(PKG_BUILD_DIR)/slpd/slpd $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/slptool/.libs/slptool $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libslp/.libs/libslp.so* $(1)/lib + $(CP) $(PKG_BUILD_DIR)/libslp/.libs/libslp.so* $(1)/lib $(INSTALL_DATA) ./files/etc/slp.* $(1)/etc $(INSTALL_BIN) ./files/etc/init.d/* $(1)/etc/init.d endef diff --git a/sound/lame/Makefile b/sound/lame/Makefile index d1fcd6c4c..803aec7f6 100644 --- a/sound/lame/Makefile +++ b/sound/lame/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lame PKG_VERSION:=398 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/lame PKG_MD5SUM:=f44b9f8e1b5d8835d0a77f9cc9cedd1c @@ -54,7 +54,7 @@ endef define Package/lame-lib/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ endef define Build/InstallDev @@ -63,7 +63,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/lame/*.h \ $(1)/usr/include/lame/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) \ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/*.{la,so*} \ $(1)/usr/lib/ endef diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile index ef61297eb..98cfebea1 100644 --- a/utils/dosfstools/Makefile +++ b/utils/dosfstools/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dosfstools PKG_VERSION:=2.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/ @@ -51,9 +51,9 @@ endef define Package/dosfstools/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fsck.{msdos,vfat} $(1)/usr/sbin/ + (cd $(1)/usr/sbin; ln -s dosfsck fsck.msdos; ln -s dosfsck fsck.vfat) $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.{msdos,vfat} $(1)/usr/sbin/ + (cd $(1)/usr/sbin; ln -s mkdofs mkfs.msdos; ln -s mkdofs mkfs.vfat) endef $(eval $(call BuildPackage,dosfstools)) diff --git a/utils/owfs/Makefile b/utils/owfs/Makefile index 87e409636..6a01be0c3 100644 --- a/utils/owfs/Makefile +++ b/utils/owfs/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=owfs PKG_VERSION:=2.7p7 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -203,12 +203,12 @@ endef define Package/libow/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libow-*.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libow-*.so.* $(1)/usr/lib/ endef define Package/libow-capi/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so.* $(1)/usr/lib/ #$(INSTALL_DIR) $(1)/usr/include #$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/{owcapi,owfs_config}.h $(1)/usr/include/ endef