Generalization.

2 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e15702ae4659..117f7e14ede8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,11 +9,8 @@ pkgbase = troff-git
 	license = custom
 	makedepends = git
 	provides = troff
-	conflicts = groff
-	conflicts = grap
 	source = troff-git::git://repo.or.cz/troff.git
 	md5sums = SKIP
-	sha1sums = SKIP
 
 pkgname = troff-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4088e0bbdf6e..84683cc716a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,30 +21,33 @@ install=
 source=("$pkgname::git://repo.or.cz/troff.git")
 noextract=()
 md5sums=('SKIP')
-sha1sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$pkgname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prefix="/usr"
-libdir="$prefix/lib/troff"
-docdir="/share/doc"
-## uncomment bellow to avoid conflict with groff and grap package by installing to, e.g. /opt directory
+## Choose prefix:
+#prefix="/usr"
+prefix="/usr/plan9"
 #prefix="/opt/$pkgname"
-#libdir="$prefix/lib"
-#docdir="/doc"
 
+libdir="lib/troff"
+docdir="share/doc/$pkgname"
 licensedir="/usr/share/licenses/$pkgname/"
+tbase="$prefix/$libdir"
 
 if [ "$prefix" == "/usr" ]; then
   conflicts=('groff' 'grap')
+elif [ "$prefix" == "/opt/$pkgname" ]; then
+  libdir="lib"
+  docdir="doc"
+  tbase="$prefix/$libdir"
 fi
 
 prepare() {
   cd "$srcdir/$pkgname"
-  sed -i "s|/root/troff/home|$libdir|" conf.mk
+  sed -i "s@/root/troff/home@$tbase@" conf.mk
 }
 
 build() {
@@ -56,7 +59,7 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname"
-  prefix=$pkgdir/$prefix
+  prefix="$pkgdir/$prefix"
   install -Dm755 eqn/eqn $prefix/bin/eqn
   install -Dm755 grap/grap $prefix/bin/grap
   install -Dm755 pic/pic $prefix/bin/pic
@@ -67,9 +70,8 @@ package() {
   install -Dm644 README $prefix/$docdir/README
   install -Dm644 NOTICE $pkgdir/$licensedir/NOTICE
 
-  libdir=$pkgdir/$libdir
-  mkdir -p $libdir
+  mkdir -p $prefix/$libdir
   cd "$srcdir/$pkgname/home"
-  cp -a font hyphen ps term tmac $libdir/
+  cp -a font hyphen ps term tmac $prefix/$libdir/
 }