From d53388fb90ee9594e07b8f00cc45436e6318c972 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 6 Jan 2008 10:23:49 -0600
Subject: 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>
---
 Makefile.am            |  4 ++++
 PKGBUILD.proto         | 35 +++++++++++++++++++++++++++++++++++
 contrib/Makefile.am    |  2 --
 contrib/PKGBUILD.proto | 35 -----------------------------------
 contrib/README         |  3 ---
 contrib/proto.install  | 36 ------------------------------------
 proto.install          | 36 ++++++++++++++++++++++++++++++++++++
 7 files changed, 75 insertions(+), 76 deletions(-)
 create mode 100644 PKGBUILD.proto
 delete mode 100644 contrib/PKGBUILD.proto
 delete mode 100644 contrib/proto.install
 create mode 100644 proto.install

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/PKGBUILD.proto b/PKGBUILD.proto
new file mode 100644
index 00000000..9e4b69a0
--- /dev/null
+++ b/PKGBUILD.proto
@@ -0,0 +1,35 @@
+# This is an example PKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Contributor: Your Name <youremail@domain.com>
+pkgname=NAME
+pkgver=VERSION
+pkgrel=1
+pkgdesc=""
+arch=()
+url=""
+license=('GPL')
+groups=()
+depends=()
+makedepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+source=($pkgname-$pkgver.tar.gz)
+noextract=()
+md5sums=() #generate with 'makepkg -g'
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make || return 1
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
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/PKGBUILD.proto b/contrib/PKGBUILD.proto
deleted file mode 100644
index 9e4b69a0..00000000
--- a/contrib/PKGBUILD.proto
+++ /dev/null
@@ -1,35 +0,0 @@
-# This is an example PKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Contributor: Your Name <youremail@domain.com>
-pkgname=NAME
-pkgver=VERSION
-pkgrel=1
-pkgdesc=""
-arch=()
-url=""
-license=('GPL')
-groups=()
-depends=()
-makedepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-source=($pkgname-$pkgver.tar.gz)
-noextract=()
-md5sums=() #generate with 'makepkg -g'
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
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/contrib/proto.install
deleted file mode 100644
index 074840e4..00000000
--- a/contrib/proto.install
+++ /dev/null
@@ -1,36 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/proto.install b/proto.install
new file mode 100644
index 00000000..074840e4
--- /dev/null
+++ b/proto.install
@@ -0,0 +1,36 @@
+# This is a default template for a post-install scriptlet.  You can
+# remove any functions you don't need (and this header).
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_upgrade() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+# vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-70-g09d2