apr: clean up the Makefile

- sort configure variables
- clean up installation defines (use macros, improve sed scripts,
  remove gratuitous slashes & whitespaces)

Signed-off-by: Sebastian Kemper <redacted>

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 281df24e11d9f9921167d6d30f70c8cc20e9d6ca..edc8bc061e180233a59cfe2c88bb80941010caab 100644 (file)
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -44,44 +44,41 @@ CONFIGURE_ARGS += \
 
 # XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure
 CONFIGURE_VARS += \
+       ac_cv_func_pthread_mutexattr_setpshared=yes \
+       ac_cv_func_sem_open=yes \
        ac_cv_sizeof_struct_iovec=1 \
        ac_cv_struct_rlimit=yes \
-       ac_cv_func_sem_open=yes \
-       ac_cv_func_pthread_mutexattr_setpshared=yes \
+       apr_cv_accept4=yes \
+       apr_cv_dup3=yes \
+       apr_cv_epoll=yes \
+       apr_cv_epoll_create1=yes \
+       apr_cv_mutex_recursive=yes \
        apr_cv_mutex_robust_shared=yes \
-       apr_cv_tcp_nodelay_with_cork=yes \
-       apr_cv_sock_cloexec=yes \
        apr_cv_process_shared_works=yes \
-       apr_cv_mutex_recursive=yes \
-       apr_cv_epoll_create1=yes \
-       apr_cv_epoll=yes \
-       apr_cv_dup3=yes \
-       apr_cv_accept4=yes
+       apr_cv_sock_cloexec=yes \
+       apr_cv_tcp_nodelay_with_cork=yes
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1
-       $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
-               $(1)/usr/bin/
-       $(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
-               $(1)/usr/include/apr-1/
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
-               $(1)/usr/lib/
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
-               $(1)/usr/lib/pkgconfig/
-       $(CP)   $(PKG_INSTALL_DIR)/usr/share/build-1/* \
-               $(1)/usr/share/build-1/
-       $(SED) 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
+       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 \
+               $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
+                                               $(1)/usr/bin
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
+                                       $(1)/usr/include/apr-1
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} $(1)/usr/lib
+       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
+                                               $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1
+       $(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \
+                                       $(1)/usr/bin/apr-1-config
+       $(SED) '/^datadir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config
+       $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' \
+                               $(1)/usr/share/build-1/apr_rules.mk
 endef
 
 define Package/libapr/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,libapr))