diff options
| -rw-r--r-- | etc/Makefile.am | 2 | ||||
| -rw-r--r-- | etc/abs/supfile.arch | 2 | ||||
| -rw-r--r-- | etc/abs/supfile.community | 2 | ||||
| -rw-r--r-- | etc/abs/supfile.extra | 2 | ||||
| -rw-r--r-- | etc/abs/supfile.testing | 2 | ||||
| -rw-r--r-- | etc/abs/supfile.unstable | 2 | ||||
| -rw-r--r-- | etc/makepkg.conf.in | 2 | ||||
| -rw-r--r-- | etc/pacman.conf.in | 12 |
8 files changed, 14 insertions, 12 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am index 2bd7cc12..135eae6f 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -8,6 +8,8 @@ MOSTLYCLEANFILES = $(dist_sysconf_DATA) #### Taken from the autoconf scripts Makefile.am #### edit = sed \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@prefix[@]|$(prefix)|g' \ -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@PKGEXT[@]|$(PKGEXT)|g' \ diff --git a/etc/abs/supfile.arch b/etc/abs/supfile.arch index e23a785d..4ab4e499 100644 --- a/etc/abs/supfile.arch +++ b/etc/abs/supfile.arch @@ -1,5 +1,5 @@ # -# /etc/abs/supfile.arch +# supfile.arch # # this is the host containing the current PKGBUILD files diff --git a/etc/abs/supfile.community b/etc/abs/supfile.community index 87cc3351..6565ea50 100644 --- a/etc/abs/supfile.community +++ b/etc/abs/supfile.community @@ -1,5 +1,5 @@ # -# /etc/abs/supfile.community +# supfile.community # # this is the host containing the community PKGBUILD files diff --git a/etc/abs/supfile.extra b/etc/abs/supfile.extra index 997027ab..3f69a7b5 100644 --- a/etc/abs/supfile.extra +++ b/etc/abs/supfile.extra @@ -1,5 +1,5 @@ # -# /etc/abs/supfile.extra +# supfile.extra # # this is the host containing the extra PKGBUILD files diff --git a/etc/abs/supfile.testing b/etc/abs/supfile.testing index 92c9f2ea..d2fc6106 100644 --- a/etc/abs/supfile.testing +++ b/etc/abs/supfile.testing @@ -1,5 +1,5 @@ # -# /etc/abs/supfile.testing +# supfile.testing # # this is the host containing the testing PKGBUILD files diff --git a/etc/abs/supfile.unstable b/etc/abs/supfile.unstable index d2c2041c..d567313d 100644 --- a/etc/abs/supfile.unstable +++ b/etc/abs/supfile.unstable @@ -1,5 +1,5 @@ # -# /etc/abs/supfile.unstable +# supfile.unstable # # this is the host containing the unstable PKGBUILD files diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 2f2809e2..2fc796e1 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -1,5 +1,5 @@ # -# /etc/makepkg.conf +# /@sysconfdir@/makepkg.conf # ######################################################################### diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 56b1f833..ad23e47a 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -1,5 +1,5 @@ # -# /etc/pacman.conf +# /@sysconfdir@/pacman.conf # # See the pacman manpage for option directives @@ -20,23 +20,23 @@ HoldPkg = pacman glibc # have identical names, regardless of version number # #[testing] -#Include = /etc/pacman.d/testing +#Include = /@sysconfdir@/pacman.d/testing [current] # Add your preferred servers here, they will be used first -Include = /etc/pacman.d/current +Include = /@sysconfdir@/pacman.d/current [extra] # Add your preferred servers here, they will be used first -Include = /etc/pacman.d/extra +Include = /@sysconfdir@/pacman.d/extra [community] # Add your preferred servers here, they will be used first -Include = /etc/pacman.d/community +Include = /@sysconfdir@/pacman.d/community #[unstable] # Add your preferred servers here, they will be used first -#Include = /etc/pacman.d/unstable +#Include = /@sysconfdir@/pacman.d/unstable # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. |