summaryrefslogtreecommitdiff
path: root/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'rpm')
-rw-r--r--rpm/Makefile4
-rw-r--r--rpm/template6
2 files changed, 7 insertions, 3 deletions
diff --git a/rpm/Makefile b/rpm/Makefile
index 148a3a19d6..22544506f6 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -64,7 +64,9 @@ instvars = include lib bin sbin data others
# Generate the rpm spec file for this configuration.
$(config): template $(distinfo) Makefile
rm -f $@.new
- (sed -e 's%@VERSION@%$(version)%g' $<; \
+ (sed -e 's%@VERSION@%$(version)%g' \
+ -e 's%@prefix@%$(prefix)%g' \
+ $<; \
($(foreach var,$(instvars),\
list='$(install-$(var))'; \
for f in $$list; do \
diff --git a/rpm/template b/rpm/template
index f4c2e9f7d7..7b03ed5ab2 100644
--- a/rpm/template
+++ b/rpm/template
@@ -10,11 +10,13 @@ Source: glibc-@VERSION@.tar.gz
%setup
%build
-configure --prefix=/usr
-cat >configparms <<EOF
+configure --prefix=@prefix@
+if test x@prefix@ = /usr; then
+ cat >configparms <<EOF
slibdir=/lib
sysconfdir=/etc
EOF
+fi
make
%install