Initial packaging support

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..d5cca8f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,40 @@
+#
+#  Keyringer Makefile by Silvio Rhatto (rhatto at riseup.net).
+#
+#  This Makefile is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the Free
+#  Software Foundation; either version 2 of the License, or any later version.
+#
+#  This Makefile is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+#  Place - Suite 330, Boston, MA 02111-1307, USA
+#
+
+PACKAGE = keyringer
+VERSION = 0.1
+PREFIX = /usr
+INSTALL = /usr/bin/install
+
+clean:
+       find . -name *~ | xargs rm -f # clean local backups
+
+install_lib:
+       $(INSTALL) -D --mode=0644 lib/keyringer/csr.sh $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/csr.sh
+       $(INSTALL) -D --mode=0644 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
+
+install_share:
+       $(INSTALL) -D --mode=0755 share/keyringer/* $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)
+
+install_bin:
+       $(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
+
+install_doc:
+       $(INSTALL) -D --mode=0644 README $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)/README
+       $(INSTALL) -D --mode=0644 LICENSE $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)/LICENSE
+
+install: clean
+       @make install_lib install_share install_bin install_doc

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..cbe925d
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+       dh $@

diff --git a/keyringer b/keyringer
index 8a6eeb169cbb328400c7eac05106c34515e0c055..7089a081817414398ff7c6f16334723537778078 100755 (executable)
--- a/keyringer
+++ b/keyringer
@@ -134,14 +134,30 @@ CONFIG="$HOME/.$NAME/config"
 BASENAME="`basename $0`"
 KEYRING="$1"
 ACTION="$2"
-ACTIONS="`dirname $(readlink -f $0)`/share/$NAME"
 
 # Export preferences and version for other scripts
 export PREFERENCES="`dirname $CONFIG`/$KEYRING"
 export KEYRINGER_VERSION
 
+# Set functions location
+if [ -e "`dirname $(readlink -f $0)`/lib/$NAME/functions" ]; then
+  # Development or local installation layout
+  LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions"
+else
+  # System installation layout
+  LIB="`dirname $(readlink -f $0)`/../lib/$NAME/functions"
+fi
+
+# Set actions location
+if [ -e "`dirname $(readlink -f $0)`/share/$NAME" ]; then
+  # Development or local installation layout
+  ACTIONS="`dirname $(readlink -f $0)`/share/$NAME"
+else
+  # System installation layout
+  ACTIONS="`dirname $(readlink -f $0)`/../share/$NAME"
+fi
+
 # Load functions
-LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions"
 source "$LIB" || exit 1
 
 # Setup main configuration and load preferences