aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Rousse <guillomovitch@mandriva.org>2007-03-05 12:00:18 +0000
committerGuillaume Rousse <guillomovitch@mandriva.org>2007-03-05 12:00:18 +0000
commit488d4e371c95e3ff7b16b31db3f8310868552062 (patch)
tree09d26064101026d49ce3f9b974c61dd1a7f2d657
parentf603cf1d47b19c2cdf7ef3b62ef828c34714fa1b (diff)
downloadspec-helper-488d4e371c95e3ff7b16b31db3f8310868552062.tar
spec-helper-488d4e371c95e3ff7b16b31db3f8310868552062.tar.gz
spec-helper-488d4e371c95e3ff7b16b31db3f8310868552062.tar.bz2
spec-helper-488d4e371c95e3ff7b16b31db3f8310868552062.tar.xz
spec-helper-488d4e371c95e3ff7b16b31db3f8310868552062.zip
fix installation and substitution
-rw-r--r--Makefile4
-rw-r--r--spec-helper.macros.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index aad1a3f..0bf9fc4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,12 +21,12 @@ install: $(MACROS_FILES)
install -d -m 755 $(DESTDIR)$(bindir)
install -m 755 $(BIN_FILES) $(DESTDIR)$(bindir)
install -d -m 755 $(DESTDIR)$(pkgdatadir)
- install -m 755 $(SCRIPTS) $(DESTDIR)$(pkgdatadir)
+ install -m 755 $(SCRIPT_FILES) $(DESTDIR)$(pkgdatadir)
install -d -m 755 $(DESTDIR)/$(rpmmacrosdir)
install -m 644 $(MACROS_FILES) $(DESTDIR)/$(rpmmacrosdir)
spec-helper.macros: spec-helper.macros.in
- sed -e 's:@SPEC_HELPER_ROOT@:$(pkgdatadir):' < $< > $@
+ sed -e 's:@pkgdatadir@:$(pkgdatadir):' < $< > $@
clean:
rm -f *~
diff --git a/spec-helper.macros.in b/spec-helper.macros.in
index 16a20a9..1cd529f 100644
--- a/spec-helper.macros.in
+++ b/spec-helper.macros.in
@@ -1,6 +1,6 @@
# $Id$
-%_spec_helper_dir @SPEC_HELPER_ROOT@
+%_spec_helper_dir @pkgdatadir@
%__spec_helper_post \
%{?!dont_clean_files: [ -n "$DONT_CLEANUP" ] || %_spec_helper_dir/clean_files} \