summaryrefslogtreecommitdiffstats
path: root/package/glib
diff options
context:
space:
mode:
Diffstat (limited to 'package/glib')
-rw-r--r--package/glib/Makefile16
-rw-r--r--package/glib/patches/04-gcc3.4-fix2
2 files changed, 9 insertions, 9 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 2715d9fcc..cb697995d 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -81,22 +81,22 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_GLIB1):
install -m0755 -d $(IDIR_GLIB1)/usr/lib
- cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(IDIR_GLIB1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(IDIR_GLIB1)/usr/lib/
$(RSTRIP) $(IDIR_GLIB1)
$(IPKG_BUILD) $(IDIR_GLIB1) $(PACKAGE_DIR)
$(STAGING_DIR)/usr/lib/libglib.so: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/bin
- cp -fpR $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/
mkdir -p $(STAGING_DIR)/usr/include
- cp -fpR $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/
- cp -fpR $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/
+ $(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 -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/
- cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/
- cp -fpR $(PKG_INSTALL_DIR)/usr/lib/glib $(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 -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
touch $(STAGING_DIR)/usr/lib/libglib.so
install-dev: $(STAGING_DIR)/usr/lib/libglib.so
diff --git a/package/glib/patches/04-gcc3.4-fix b/package/glib/patches/04-gcc3.4-fix
index 3eddcf6fe..96f10b7fa 100644
--- a/package/glib/patches/04-gcc3.4-fix
+++ b/package/glib/patches/04-gcc3.4-fix
@@ -5,7 +5,7 @@ Origin: self-created, http://www.uwe-dueffert.de/lfs/ownpatches/glib-1.2.10-gcc3
Upstream Status: not reported
Description: fix compilation of glib1 with gcc34
-$LastChangedBy: bdubbs $
+$LastChangedBy$
$Date$
diff -Naur glib-1.2.10.orig/gstrfuncs.c glib-1.2.10/gstrfuncs.c