From: Sebastian Kemper <redacted>
Date: Wed, 1 Jan 2020 23:00:41 +0000 (+0100)
Subject: apache: update InstallDev
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=39e68309e8279d68496f649140f6df8ce59a3efd;p=openwrt-packages.git

apache: update InstallDev

The package doesn't need to install _everything_ to staging. This commit
reduces the amount of files that get copied over to staging. Currently
there's no package depending on apache anyway.

This adds sed scripts from buildroot (thanks!) to fix two files that are
important for cross-compiling external modules. This has been tested and
was confirmed to work with mod_gnutls taken as an example package.

Signed-off-by: Sebastian Kemper <redacted>
---

diff --git a/net/apache/Makefile b/net/apache/Makefile
index a8356c34e..6525a87a7 100644
--- a/net/apache/Makefile
+++ b/net/apache/Makefile
@@ -265,24 +265,21 @@ define Build/Prepare
 endef
 
 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 :)
-	$(INSTALL_DIR) $(1)/etc
-	$(CP)   $(PKG_INSTALL_DIR)/etc/* \
-		$(1)/etc
-	$(INSTALL_DIR) $(1)/usr/include/apache
-	$(CP)	$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/apache
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/httpd.exp \
-		$(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP)   $(PKG_INSTALL_DIR)/usr/sbin/* \
-		$(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/share
-	$(CP)   $(PKG_INSTALL_DIR)/usr/share/* \
-		$(1)/usr/share
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/apxs $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/include/apache2
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/apache2/* \
+					$(1)/usr/include/apache2
+	$(INSTALL_DIR) $(1)/usr/lib/apache2
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/apache2/httpd.exp \
+						$(1)/usr/lib/apache2
+	$(INSTALL_DIR) $(1)/usr/share/apache2/build
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/apache2/build/* \
+				$(1)/usr/share/apache2/build
+	$(SED) 's%/usr/share/apache2/build%$(STAGING_DIR)/usr/share/apache2/build%' \
+		$(1)/usr/bin/apxs
+	$(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' \
+		$(1)/usr/share/apache2/build/config_vars.mk
 endef
 
 define Package/apache/install