Thu Jun 27 14:52:30 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
authorroland <roland>
Fri, 28 Jun 1996 09:59:59 +0000 (09:59 +0000)
committerroland <roland>
Fri, 28 Jun 1996 09:59:59 +0000 (09:59 +0000)
* rpm/Makefile (headers, install-lib, install-lib.so,
versioned, install-bin, install-sbin, install-data,
install-others): Add $(-VARIABLE).

rpm/Makefile

index 36e91b9..148a3a1 100644 (file)
@@ -15,15 +15,17 @@ distinfo := $(common-objpfx)distinfo- \
 
 config = $(config-machine)-$(config-vendor)-$(config-os)
 
-headers := $(foreach d,$(subdirs),$($d-headers))
-install-lib := $(foreach d,$(subdirs),$($d-install-lib))
-install-lib.so := $(foreach d,$(subdirs),$(filter-out $($d-versioned),\
+headers := $(-headers) $(foreach d,$(subdirs),$($d-headers))
+install-lib := $(-install-lib) $(foreach d,$(subdirs),$($d-install-lib))
+install-lib.so := $(-install-lib.so) \
+                 $(foreach d,$(subdirs),$(filter-out $($d-versioned),\
                                                      $($d-install-lib.so)))
-versioned := $(foreach d,$(subdirs),$($d-versioned))
-install-bin := $(foreach d,$(subdirs),$($d-install-bin))
-install-sbin := $(foreach d,$(subdirs),$($d-install-sbin))
-install-data := $(foreach d,$(subdirs),$($d-install-data))
-install-others := $(foreach d,$(subdirs),$($d-install-others))
+versioned := $(-versioned) $(foreach d,$(subdirs),$($d-versioned))
+install-bin := $(-install-bin) $(foreach d,$(subdirs),$($d-install-bin))
+install-sbin := $(-install-sbin) $(foreach d,$(subdirs),$($d-install-sbin))
+install-data := $(-install-data) $(foreach d,$(subdirs),$($d-install-data))
+install-others := $(-install-others) \
+                 $(foreach d,$(subdirs),$($d-install-others))
 
 # Notice things to be installed in /etc.  They get specially marked as
 # possibly user-modified config files.