Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=2b7f64a52a462c162512224e7be3352be20376f2
commit 2b7f64a52a462c162512224e7be3352be20376f2
Author: VMiklos <[EMAIL PROTECTED]>
Date: Sun Sep 30 22:37:44 2007 +0200
fwmakepkg: move it to its own dir: it's a library, not an executable
diff --git a/Makefile b/Makefile
index 23417d6..67a21e4 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ install: compile
$(INSTALL) -m644 repoman.conf $(DESTDIR)$(sysconfdir)
$(INSTALL) -m644 repoman.d/current $(DESTDIR)$(sysconfdir)/repoman.d/current
$(INSTALL) -m644 repoman.d/stable $(DESTDIR)$(sysconfdir)/repoman.d/stable
- $(INSTALL) fwmakepkg $(DESTDIR)$(libdir)
+ $(INSTALL) lib/fwmakepkg $(DESTDIR)$(libdir)
$(INSTALL) etcconfig.py $(DESTDIR)$(sbindir)/etcconfig
$(INSTALL) rpm2fpm $(DESTDIR)$(bindir)/rpm2fpm
$(INSTALL) fwcpan $(DESTDIR)$(bindir)/fwcpan
diff --git a/fwmakepkg b/fwmakepkg
deleted file mode 100644
index 2507287..0000000
--- a/fwmakepkg
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2005-2006 Miklos Vajna <[EMAIL PROTECTED]>
-# fwmakepkg for Frugalware
-# distributed under GPL License
-
-if [ -e /etc/repoman.conf ]; then
- . /etc/repoman.conf
-else
- echo "Can't find /etc/repoman.conf!"
- exit 1
-fi
-[ -z "$startdir" ] && startdir=`pwd`
-
-### Include a scheme. They are in $fst_root/source/include/, and they have a \
- # .sh suffix. After including them, you can of course overwrite the \
- # initialized values, using only a part of the scheme.
- # @param scheme(s) to include (_without_ the .sh suffix)
- ##
-Finclude ()
-{
- if [ "$startdir" = `pwd` ]; then
- local i
- i=`git rev-parse --git-dir 2>/dev/null`
- if [ "`type -p git`" -a -n "$i" ]; then
- i=`dirname $i`
- F_makepkg_scm=git
- else
- i=`pwd`
- while true
- do
- if [ -e "$i/_darcs" ]; then
- break
- elif [ "$i" == "" ]; then
- break
- fi
- i=${i%/*}
- done
- F_makepkg_scm=darcs
- fi
- if [ "$i" -a -d "$i"/source/include ]; then
- Fincdir=$i/source/include
- elif [ -d /var/tmp/fst/include ]; then
- Fincdir=/var/tmp/fst/include
- elif [ -d $fst_root/$repos/source/include ]; then
- Fincdir=$fst_root/$repos/source/include
- fi
- if [ ! -z "$Fincdir" ]; then
- for i in "$@"
- do
- source $Fincdir/$i.sh || Fdie
- done
- else
- echo "Could not find the scheme dir!
(\$fst/source/include)"
- echo "Please edit your /etc/repoman.conf or
~/.repoman.conf."
- exit 2
- fi
- fi
-}
-
-Finclude util
diff --git a/lib/fwmakepkg b/lib/fwmakepkg
new file mode 100644
index 0000000..2507287
--- /dev/null
+++ b/lib/fwmakepkg
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# Copyright (C) 2005-2006 Miklos Vajna <[EMAIL PROTECTED]>
+# fwmakepkg for Frugalware
+# distributed under GPL License
+
+if [ -e /etc/repoman.conf ]; then
+ . /etc/repoman.conf
+else
+ echo "Can't find /etc/repoman.conf!"
+ exit 1
+fi
+[ -z "$startdir" ] && startdir=`pwd`
+
+### Include a scheme. They are in $fst_root/source/include/, and they have a \
+ # .sh suffix. After including them, you can of course overwrite the \
+ # initialized values, using only a part of the scheme.
+ # @param scheme(s) to include (_without_ the .sh suffix)
+ ##
+Finclude ()
+{
+ if [ "$startdir" = `pwd` ]; then
+ local i
+ i=`git rev-parse --git-dir 2>/dev/null`
+ if [ "`type -p git`" -a -n "$i" ]; then
+ i=`dirname $i`
+ F_makepkg_scm=git
+ else
+ i=`pwd`
+ while true
+ do
+ if [ -e "$i/_darcs" ]; then
+ break
+ elif [ "$i" == "" ]; then
+ break
+ fi
+ i=${i%/*}
+ done
+ F_makepkg_scm=darcs
+ fi
+ if [ "$i" -a -d "$i"/source/include ]; then
+ Fincdir=$i/source/include
+ elif [ -d /var/tmp/fst/include ]; then
+ Fincdir=/var/tmp/fst/include
+ elif [ -d $fst_root/$repos/source/include ]; then
+ Fincdir=$fst_root/$repos/source/include
+ fi
+ if [ ! -z "$Fincdir" ]; then
+ for i in "$@"
+ do
+ source $Fincdir/$i.sh || Fdie
+ done
+ else
+ echo "Could not find the scheme dir!
(\$fst/source/include)"
+ echo "Please edit your /etc/repoman.conf or
~/.repoman.conf."
+ exit 2
+ fi
+ fi
+}
+
+Finclude util
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
