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 d383d4e90910a4b8fe085f1ed401873fab53c04f..106d55bdd2b1e48780c7ba664bb7081ff0b9552b 100644 (file)
--- 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 0eb9c85f748543f60aae2d45543f39a2935edcf3..37bf075e01b25c4065addfa638bd0a26d9a2e768 100644 (file)
--- 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 e2efad8d5a7b821f0c6e01af44007c38511bee4a..6aca8b9e9e02a7fe71f84ac3294f3f4a1a4eccec 100644 (file)
--- 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