diff options
| author | Guillaume Rousse <guillomovitch@mandriva.org> | 2007-03-05 12:03:28 +0000 |
|---|---|---|
| committer | Guillaume Rousse <guillomovitch@mandriva.org> | 2007-03-05 12:03:28 +0000 |
| commit | 9f85e747d04cc21a9e2b23a55b36149390907026 (patch) | |
| tree | 639faf67bb5f8e07e4da2c5f0abdfa38c322d3ac | |
| parent | 0eda59106af8bd04a8a79aefa6f2ee7c1e71d6bc (diff) | |
| download | rpm-helper-9f85e747d04cc21a9e2b23a55b36149390907026.tar rpm-helper-9f85e747d04cc21a9e2b23a55b36149390907026.tar.gz rpm-helper-9f85e747d04cc21a9e2b23a55b36149390907026.tar.bz2 rpm-helper-9f85e747d04cc21a9e2b23a55b36149390907026.tar.xz rpm-helper-9f85e747d04cc21a9e2b23a55b36149390907026.zip | |
fix installation and substitutions
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | rpm-helper.macros.in | 8 |
2 files changed, 9 insertions, 7 deletions
@@ -9,15 +9,15 @@ MACROS_FILES = rpm-helper.macros FILES = AUTHORS README README.CVS COPYING ChangeLog Makefile \ $(SCRIPT_FILES) $(MACROS_FILES:=.in) -pkgdatadir = /usr/share/$(PACKAGE) -rpmacrosdir = /etc/rpm/macros.d +pkgdatadir = /usr/share/$(PACKAGE) +rpmmacrosdir = /etc/rpm/macros.d all: @echo "use make install or make dist" install: $(MACROS_FILES) install -d -m 755 $(DESTDIR)$(pkgdatadir) - cp -p $(SCRIPTS) $(DESTDIR)$(pkgdatadir) + cp -p $(SCRIPT_FILES) $(DESTDIR)$(pkgdatadir) install -d -m 755 $(DESTDIR)$(rpmacrosdir) install -m 644 $(MACROS_FILES) $(DESTDIR)/$(rpmmacrosdir) @@ -47,7 +47,7 @@ tar: # rules to build a public distribution -dist: changelog cleandist dir localcopy tar +dist: changelog cleandist dir localcopy tar svntag changelog: svn2cl -o ChangeLog || : diff --git a/rpm-helper.macros.in b/rpm-helper.macros.in index fe1ce81..ff307e6 100644 --- a/rpm-helper.macros.in +++ b/rpm-helper.macros.in @@ -3,10 +3,12 @@ %_rpm_helper_dir @pkgdatadir@ %_get_password_helper %_rpm_helper_dir/get-password -%get_password() %(%_get_password_helper %{1}) +%get_password() %_get_password_helper %{1} \ +%{nil} -%_get_free_syslog_facility_helper %_rpm_helper_dir/get-free-syslog-facility -%get_free_syslog_facility() %(%_get_free_syslog_facility_helper) +%_get_free_syslog_facility_helper %_rpm_helper_dir/get_free_syslog_facility +%get_free_syslog_facility() %_get_free_syslog_facility_helper %{1} \ +%{nil} %_create_ghostfile_helper %_rpm_helper_dir/create-file %create_ghostfile() %_create_ghostfile_helper %{name} $1 %{1} %{2} %{3} %{4} \ |