summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-06 10:23:49 -0600
committerDan McGee <dan@archlinux.org>2008-01-06 10:23:49 -0600
commitd53388fb90ee9594e07b8f00cc45436e6318c972 (patch)
tree0c1f025fd7adaec0f787adca3393ef3a9ba51451
parente0e33c329ff249d7862a0e7ec508794faa98efd8 (diff)
downloadpacman-d53388fb90ee9594e07b8f00cc45436e6318c972.tar.xz
install: install prototype PKGBUILD and install to datadir
Move the prototypes out of contrib/ and into the top level directory, and install them to what is usually /usr/share/pacman/ on a package install. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--Makefile.am4
-rw-r--r--PKGBUILD.proto (renamed from contrib/PKGBUILD.proto)0
-rw-r--r--contrib/Makefile.am2
-rw-r--r--contrib/README3
-rw-r--r--proto.install (renamed from contrib/proto.install)0
5 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 307a7d68..6453555e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,10 @@ endif
# AUTHORS, COPYING, NEWS, README
EXTRA_DIST = HACKING
+# Sample makepkg prototype files
+pkgdatadir = ${datadir}/${PACKAGE}
+dist_pkgdata_DATA = PKGBUILD.proto proto.install
+
# run the pactest test suite
check-local: src/pacman
$(PYTHON) $(top_srcdir)/pactest/pactest.py --debug=1 \
diff --git a/contrib/PKGBUILD.proto b/PKGBUILD.proto
index 9e4b69a0..9e4b69a0 100644
--- a/contrib/PKGBUILD.proto
+++ b/PKGBUILD.proto
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 2e088691..9f01e187 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,10 +1,8 @@
EXTRA_DIST = \
- PKGBUILD.proto \
PKGBUILD.vim \
bash_completion \
pacdiff \
pacsearch \
- proto.install \
re-pacman \
vimproject \
wget-xdelta.sh \
diff --git a/contrib/README b/contrib/README
index d8427037..c9ff86f4 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,8 +1,5 @@
Here is a brief description of the files included in this directory:
-PKGBUILD.proto, proto.install - prototype PKGBUILD and install files for
-creating packages using makepkg.
-
PKGBUILD.vim - a vim/gvim syntax file for PKGBUILDs. Colors known variable
names, highlights common errors such as invalid characters in pkgname or
pkgver, etc.
diff --git a/contrib/proto.install b/proto.install
index 074840e4..074840e4 100644
--- a/contrib/proto.install
+++ b/proto.install