X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1d5b030b9a4fa38191171a9c58047c06c4212bed..8931e7504dacbc865094bf6b8ab7033e56a8d2c2:/package/libmad/Makefile

diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 4a979d0c0..91983eac5 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -19,6 +19,14 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBMAD,libmad,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
+FPM:=default
+ifeq ($(ARCH),i386)
+FPM:=intel
+endif
+ifeq ($(ARCH),mipsel)
+FPM:=mips
+endif
+
 $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -50,7 +58,7 @@ $(PKG_BUILD_DIR)/.configured:
 			--enable-static \
 			--disable-rpath \
 			--with-gnu-ld \
-			--enable-fpm=mips \
+			--enable-fpm=$(FPM) \
 			--disable-debugging \
 			--enable-speed \
 	);
@@ -66,16 +74,16 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBMAD):
 	install -m0755 -d $(IDIR_LIBMAD)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(IDIR_LIBMAD)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(IDIR_LIBMAD)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBMAD)
 	$(IPKG_BUILD) $(IDIR_LIBMAD) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libmad.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.a $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.so* $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.a $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so* $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libmad.so
@@ -86,8 +94,8 @@ uninstall-dev:
 		$(STAGING_DIR)/usr/lib/libmad.a \
 		$(STAGING_DIR)/usr/lib/libmad.so* \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
 
 mostlyclean:
 	-$(MAKE) -C $(PKG_BUILD_DIR) clean