From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 26 Feb 2011 14:15:56 +0000 (+0100)
Subject: build-essentials: Fix automatic installation of pam, upstart and default files.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d51f073b7e8ea192b375defe450b777d20f94b6c;p=ipfire-3.x.git

build-essentials: Fix automatic installation of pam, upstart and default files.

Need to rebuild all packages that include at least one of them.
---

diff --git a/pkgs/core/build-essentials/build-essentials.nm b/pkgs/core/build-essentials/build-essentials.nm
index d383d4e90..106d55bdd 100644
--- a/pkgs/core/build-essentials/build-essentials.nm
+++ b/pkgs/core/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = build-essentials
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 5
+PKG_REL        = 6
 PKG_ARCH       = noarch
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
diff --git a/pkgs/core/build-essentials/buildsystem/Constants b/pkgs/core/build-essentials/buildsystem/Constants
index 0eb9c85f7..37bf075e0 100644
--- a/pkgs/core/build-essentials/buildsystem/Constants
+++ b/pkgs/core/build-essentials/buildsystem/Constants
@@ -134,12 +134,12 @@ DO_PATCHES = cd $(DIR_APP) && $(BUILD_TOOLS)/patch \
 	$(foreach patch,$(PKG_PATCHES),$(DIR_PATCHES)/$(patch))
 
 # Get a list of files that are installed automatically
-PKG_DEFAULT_FILES  = $(wildcard *.default)
-PKG_DEFAULT_FILES += $(wildcard default/*)
-PKG_INIT_FILES     = $(wildcard *.init)
-PKG_INIT_FILES    += $(wildcard init/*.conf)
-PKG_PAM_FILES      = $(wildcard *.pam)
-PKG_PAM_FILES     += $(wildcard pam.d/*)
+PKG_DEFAULT_FILES  = $(wildcard $(DIR_SOURCE)/*.default)
+PKG_DEFAULT_FILES += $(wildcard $(DIR_SOURCE)/default/*)
+PKG_INIT_FILES     = $(wildcard $(DIR_SOURCE)/*.init)
+PKG_INIT_FILES    += $(wildcard $(DIR_SOURCE)/init/*.conf)
+PKG_PAM_FILES      = $(wildcard $(DIR_SOURCE)/*.pam)
+PKG_PAM_FILES     += $(wildcard $(DIR_SOURCE)/pam.d/*)
 
 ###############################################################################
 #
diff --git a/pkgs/core/build-essentials/buildsystem/Functions b/pkgs/core/build-essentials/buildsystem/Functions
index e2efad8d5..6aca8b9e9 100644
--- a/pkgs/core/build-essentials/buildsystem/Functions
+++ b/pkgs/core/build-essentials/buildsystem/Functions
@@ -51,7 +51,7 @@ endef
 
 define __INSTALL_DEFAULT
 	-mkdir -pv $(BUILDROOT)/etc/default
-	cd $(DIR_APP) && cp -vf $(DIR_SOURCE)/$(1) $(BUILDROOT)/etc/default/$(subst .default,,$(notdir $(1)))
+	cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)/etc/default/$(subst .default,,$(notdir $(1)))
 
 endef
 
@@ -61,7 +61,7 @@ endef
 
 define __INSTALL_INIT
 	-mkdir -pv $(BUILDROOT)/etc/init
-	cd $(DIR_APP) && cp -vf $(DIR_SOURCE)/$(1) $(BUILDROOT)/etc/init/$(subst .init,.conf,$(notdir $(1)))
+	cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)/etc/init/$(subst .init,.conf,$(notdir $(1)))
 
 endef
 
@@ -71,7 +71,7 @@ endef
 
 define __INSTALL_PAM
 	-mkdir -pv $(BUILDROOT)/etc/pam.d
-	cd $(DIR_APP) && cp -vf $(DIR_SOURCE)/$(1) $(BUILDROOT)/etc/pam.d/$(subst .pam,,$(notdir $(1)))
+	cd $(DIR_APP) && cp -vf $(1) $(BUILDROOT)/etc/pam.d/$(subst .pam,,$(notdir $(1)))
 
 endef