summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2009-04-18 14:31:48 +0300
committerPanu Matilainen <pmatilai@redhat.com>2009-05-08 15:25:29 +0300
commit08983e833a888ad0fc6d6d6d4343c9cfde6a83ef (patch)
treecf4f407b43ab13065b98110b76afde55b5b227a3
parent77d5a692a5d59e8c04d4e95d5500058bd36fd4db (diff)
downloadrpm-08983e833a888ad0fc6d6d6d4343c9cfde6a83ef.tar.gz
Fix a few file permissions from "make install"
- macros.perl, logrotate examples etc aren't scripts and shouldn't be executable. Ditto for python __init__.py (cherry picked from commit 8a3e9a74e363f530ed2b7fee0672477f69c3c661)
-rw-r--r--python/Makefile.am2
-rw-r--r--scripts/Makefile.am17
2 files changed, 9 insertions, 10 deletions
diff --git a/python/Makefile.am b/python/Makefile.am
index 776505164..207bc0490 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/misc
AM_CPPFLAGS += -I@WITH_PYTHON_INCLUDE@
pkgpyexec_LTLIBRARIES = _rpmmodule.la
-pkgpyexec_SCRIPTS = rpm/__init__.py
+pkgpyexec_DATA = rpm/__init__.py
_rpmmodule_la_LDFLAGS = -module -avoid-version
_rpmmodule_la_LIBADD = \
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3af78429b..d891fbbf9 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -30,11 +30,13 @@ rpmconfig_SCRIPTS = \
find-lang.sh \
perl.prov perl.req perldeps.pl pythondeps.sh osgideps.pl \
mono-find-requires mono-find-provides \
- rpmdb_loadcvt rpmdiff rpmdiff.cgi \
- rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
- tcl.req tgpg
+ pkgconfigdeps.sh libtooldeps.sh \
+ rpmdb_loadcvt rpmdiff rpm2cpio.sh tcl.req tgpg
-rpmconfig_SCRIPTS += macros.perl
+rpmconfig_DATA = \
+ rpmdiff.cgi rpm.daily rpm.log rpm.xinetd
+
+rpmconfig_DATA += macros.perl
macros.perl: $(srcdir)/macros.perl.in
@sed \
-e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \
@@ -42,7 +44,7 @@ macros.perl: $(srcdir)/macros.perl.in
CLEANFILES += macros.perl
EXTRA_DIST += macros.perl.in
-rpmconfig_SCRIPTS += macros.php
+rpmconfig_DATA += macros.php
macros.php: $(srcdir)/macros.php.in
@sed \
-e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \
@@ -50,13 +52,10 @@ macros.php: $(srcdir)/macros.php.in
CLEANFILES += macros.php
EXTRA_DIST += macros.php.in
-rpmconfig_SCRIPTS += macros.python
+rpmconfig_DATA += macros.python
macros.python: $(srcdir)/macros.python.in
@sed \
-e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \
< $(srcdir)/macros.python.in > macros.python
CLEANFILES += macros.python
EXTRA_DIST += macros.python.in
-
-rpmconfig_SCRIPTS += pkgconfigdeps.sh
-rpmconfig_SCRIPTS += libtooldeps.sh