Move metas/ and templ/ under ~/.genpkg.

8 files changed, 8 insertions, 8 deletions

diff --git a/bin/genpkg b/bin/genpkg
index 066db7b..6693e6f 100755
--- a/bin/genpkg
+++ b/bin/genpkg
@@ -2,7 +2,8 @@
 
 prog=genpkg
 
-libd=~/lib/genpkg
+metad=~/.genpkg/metas
+templd=~/.genpkg/templ
 tweakd=~/pkg/tweaks
 pkgd=~/pkg/dest
 vard=~/var
@@ -38,7 +39,7 @@ do
 	[ -d "$pkgd/$pkg" ] || mkdir "$pkgd/$pkg"
 	cd "$pkgd/$pkg"
 
-	if METABIN="$libd/metas" PKGVAR="$vard" makepkgmeta "$pkg" > PKGMETA
+	if METABIN="$metad" PKGVAR="$vard" makepkgmeta "$pkg" > PKGMETA
 	then
 		echo "Generated $pkgd/$pkg/PKGMETA"
 	else
@@ -57,7 +58,7 @@ do
 		echo "Tweaked PKGMETA with $tweakd/$pkg."
 	fi
 
-	if TDIR="$libd/templ" makepkgbuild
+	if TDIR="$templd" makepkgbuild
 	then
 		echo "Generated $pkgd/$pkg/PKGBUILD"
 	else
diff --git a/lib/metas/perl b/metas/perl
index 4b61175..4b61175 100755
--- a/lib/metas/perl
+++ b/metas/perl
diff --git a/lib/metas/perl.d/fetchcpan b/metas/perl.d/fetchcpan
index 076599b..076599b 100755
--- a/lib/metas/perl.d/fetchcpan
+++ b/metas/perl.d/fetchcpan
diff --git a/lib/metas/perl.d/perl-dist b/metas/perl.d/perl-dist
index 3259fd8..3259fd8 100755
--- a/lib/metas/perl.d/perl-dist
+++ b/metas/perl.d/perl-dist
diff --git a/lib/metas/perl.d/scrapecore b/metas/perl.d/scrapecore
index 2e1aba3..2e1aba3 100755
--- a/lib/metas/perl.d/scrapecore
+++ b/metas/perl.d/scrapecore
diff --git a/setup b/setup
index 5b664ac..f1c6328 100755
--- a/setup
+++ b/setup
@@ -41,17 +41,16 @@ genpkg)	md ~/bin
 	done
 
 	md ~/.genpkg
-	md ~/.genpkg/lib
-	md ~/.genpkg/lib/metas
+	md ~/.genpkg/metas
 	for m in ${metas[@]}
 	do
-		ins "lib/metas/$m" ~/.genpkg
+		ins "metas/$m" ~/.genpkg
 	done
 
-	md ~/.genpkg/lib/templ/
+	md ~/.genpkg/templ/
 	for t in ${templs[@]}
 	do
-		ins "lib/templ/$t" ~/.genpkg
+		ins "templ/$t" ~/.genpkg
 	done
 
 	md ~/.genpkg/var
diff --git a/lib/templ/pbfields b/templ/pbfields
index 5e7844c..5e7844c 100755
--- a/lib/templ/pbfields
+++ b/templ/pbfields
diff --git a/lib/templ/perl-pkg b/templ/perl-pkg
index 47cc682..47cc682 100755
--- a/lib/templ/perl-pkg
+++ b/templ/perl-pkg