From 736be0dbf69f6bc773911e7a8751489f09f3f1d2 Mon Sep 17 00:00:00 2001 From: Richard Crowley Date: Fri, 16 Apr 2010 19:23:19 +0000 Subject: [PATCH] Added -i option to change the installation make target. Installing to /usr. --- Makefile.in | 2 +- bin/sourceinstall | 11 +++++++---- configure | 18 +++++++++--------- configure.ac | 2 +- control | 2 +- man/man1/debra-build.1.gz | Bin 537 -> 537 bytes man/man1/debra-create.1.gz | Bin 618 -> 618 bytes man/man1/debra-destroy.1.gz | Bin 478 -> 478 bytes man/man1/debra-makefile.1.gz | Bin 703 -> 703 bytes man/man1/debra-sourceinstall.1.gz | Bin 638 -> 638 bytes man/man1/debra.1.gz | Bin 913 -> 913 bytes man/man1/sourceinstall.1.gz | Bin 767 -> 794 bytes man/man1/sourceinstall.1.md | 4 +++- 13 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Makefile.in b/Makefile.in index d13da8c..1caf7f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,7 +63,7 @@ deb: ifeq (root, $(shell whoami)) bin/debra create debian control $(GIT) archive --prefix=debian/ HEAD | $(GZIP) >debian.tar.gz - bin/debra sourceinstall debian debian.tar.gz -p $(prefix) + bin/debra sourceinstall debian debian.tar.gz -p /usr rm debian.tar.gz chown -R root:root debian bin/debra build debian debra_$(VERSION)_all.deb diff --git a/bin/sourceinstall b/bin/sourceinstall index d0688f6..54ec5ce 100755 --- a/bin/sourceinstall +++ b/bin/sourceinstall @@ -4,7 +4,7 @@ set -e usage() { echo "Usage: $(basename $0) " >&2 echo " [-b ]" >&2 - echo " [-f ] [-p ] [-d ]" >&2 + echo " [-f ] [-p ] [-d ] [-i ]" >&2 echo " [-c ] [-h]" >&2 if [ -n "$1" ]; then echo " path or URI to a source tarball" >&2 @@ -12,6 +12,7 @@ usage() { echo " -f flags passed to configure" >&2 echo " -p prefix passed to configure" >&2 echo " -d destination directory passed to make as DESTDIR" >&2 + echo " -i make target to run instead of install" >&2 echo " -c command to run instead of configure && make && make install" >&2 echo " -h show this help message" >&2 fi @@ -23,12 +24,13 @@ TARBALL=$1 [ -z "$TARBALL" ] && usage [ -h = $TARBALL ] && usage MOAR shift -while getopts b:f:p:c:d:h name; do +while getopts b:f:p:c:d:i:h name; do case "$name" in b) BOOTSTRAP=$OPTARG;; f) FLAGS=$OPTARG;; p) PREFIX=$OPTARG;; d) DESTDIR=$OPTARG;; + i) INSTALL=$OPTARG;; c) COMMAND=$OPTARG;; h) usage MOAR;; *) usage;; @@ -65,10 +67,11 @@ if [ -z "$COMMAND" ]; then ./configure $FLAGS --prefix=$(readlink -f $PREFIX) fi make + [ -z "$INSTALL"] && INSTALL=install if [ -z "$DESTDIR" ]; then - make install + make $INSTALL else - make install DESTDIR=$DESTDIR + make $INSTALL DESTDIR=$DESTDIR fi else eval $COMMAND diff --git a/configure b/configure index 34b5c48..02834fe 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for debra 0.2.4. +# Generated by GNU Autoconf 2.64 for debra 0.2.5. # # Report bugs to . # @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='debra' PACKAGE_TARNAME='debra' -PACKAGE_VERSION='0.2.4' -PACKAGE_STRING='debra 0.2.4' +PACKAGE_VERSION='0.2.5' +PACKAGE_STRING='debra 0.2.5' PACKAGE_BUGREPORT='richard@devstructure.com' PACKAGE_URL='' @@ -1151,7 +1151,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures debra 0.2.4 to adapt to many kinds of systems. +\`configure' configures debra 0.2.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1212,7 +1212,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of debra 0.2.4:";; + short | recursive ) echo "Configuration of debra 0.2.5:";; esac cat <<\_ACEOF @@ -1279,7 +1279,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -debra configure 0.2.4 +debra configure 0.2.5 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1296,7 +1296,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by debra $as_me 0.2.4, which was +It was created by debra $as_me 0.2.5, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2502,7 +2502,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by debra $as_me 0.2.4, which was +This file was extended by debra $as_me 0.2.5, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2553,7 +2553,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -debra config.status 0.2.4 +debra config.status 0.2.5 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index b331f46..629e713 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) -AC_INIT([debra], [0.2.4], [richard@devstructure.com]) +AC_INIT([debra], [0.2.5], [richard@devstructure.com]) # Checks for programs. AC_PROG_INSTALL diff --git a/control b/control index 0c9bca0..fb4ec7b 100644 --- a/control +++ b/control @@ -1,5 +1,5 @@ Package: debra -Version: 0.2.4-1 +Version: 0.2.5-1 Section: devel Priority: optional Essential: no diff --git a/man/man1/debra-build.1.gz b/man/man1/debra-build.1.gz index ad4ceb3e2910563687c999444018ae719befb198..cf97c0895dad5bf9bc02c88384b2d825d2c4a22f 100644 GIT binary patch delta 16 XcmbQqGLwZ}zMF&N>y8r}*@c(@EB6IG delta 16 XcmbQqGLwZ}zMF$%(xP1(*@c(@D0l?6 diff --git a/man/man1/debra-create.1.gz b/man/man1/debra-create.1.gz index 5d6d53bdd64d99ac695a3dfc260614d85a8b1f78..968e11e8d98271b8196729ab147230ecbb09a67e 100644 GIT binary patch delta 16 XcmaFG@`{CBzMF&N>y8r}*^`+7HWvmk delta 16 XcmaFG@`{CBzMF$%@}gZE*^`+7GM@#i diff --git a/man/man1/debra-destroy.1.gz b/man/man1/debra-destroy.1.gz index 8f840f785d0529da8c13eda188111e09770c6ecf..f7506c4fbb3ea3a2c5d9c5140c3d463accecb98b 100644 GIT binary patch delta 16 Ycmcb|e2^Aj05RGIG5`Po delta 16 Ycmdnbx}TL@zMF$%@}gZE*>^Aj04`evs{jB1 diff --git a/man/man1/debra-sourceinstall.1.gz b/man/man1/debra-sourceinstall.1.gz index 8366d147926ed000050980191cae689d44d4bbaf..b26285e308afc178175ce0ddf2f17b3ab5f53fce 100644 GIT binary patch delta 16 Xcmeyz@{fgGzMF&N+l~_(*~^&#IGzS= delta 16 Xcmeyz@{fgGzMF$%%A#Ex*~^&#H6{h; diff --git a/man/man1/debra.1.gz b/man/man1/debra.1.gz index 645cd06615e188730acdf88dbdd48a891e9654da..434f1e6f4a958b11274c3fbabe532c4dae0869c9 100644 GIT binary patch delta 16 XcmbQpK9QYWzMF&N+l~_(*}IqlEK>!o delta 16 XcmbQpK9QYWzMF$%%A#Ex*}IqlDBA@m diff --git a/man/man1/sourceinstall.1.gz b/man/man1/sourceinstall.1.gz index e8f65d46caefab5c6813151b6e43d8cfe202b2cd..167af215e6370e098701a1b5e8bc68a878658b8a 100644 GIT binary patch literal 794 zcmV+#1Lgc5iwFq!xX4QY19NY6a${v_ZgX^DY-}zu0L4{7Z`v>vzWY}^<+MpOw3Bw( zX_PWGQVS@dhiUBKI8I_U*qQA>*{|PoaA-o>Njpsf;rKm&`QG=vXTog&1(#e?%QH9# zTSBa)obIo~&m_cPX>I*wIxR5Lq#;wgskUlIkI!nVT_OodxVeWQSv|$`MYK#dvxkQO zf*btKYAq`GbbWJ;5ANfV6HH#t9v1=G=C?*QnsFhGrB$`fW7uA8ufRV;uGJ1GoRYv& zo#JkXk$hjS)=8ASgOf)--#z`nlqSbpc9o^NtM6`+%;RXiiB`*iB>nn;HqHXe4cL-H z&Mhk^z+bQ=W+!L$*pXEj)%;h(rLB&@B~y*GTsx;rF5#f`vyjEfcCRwktQ320LV#6m zg^~uhIMiD0MTQ4+rGaLdJ4WHGB>0jhz#4<(#BZ12*kO6$lqs2uqS4$5a85-epKZEq zr>2n9y%$hb&aBc$q_R07c?nfZ4ANswjqxgA%`&4pyEJ$*X3%c!=<{F=z2?DU88-$6 zv&aFJLuk+qN-;36J;G@gc9yMLx3D8S<#0|QMQ+@}uBoi3(GV+kt-6tf)+LG+OxhAE zYAh(p(GO`_(9N0*8kwvqI)%DD#SvIFnvK^(@3cF)y>!gMU};Dbo#psb2q~Q%|14W; zlQ3ssTsq)(h+TOaUkxg6*S=Y?pWb4AIgI3+TR`h}OL)X>aC|hgWZka*3ILFlN?X=g z7q?x%AzFt5jt&lvU?n<))~P+$8ixYg<2cTCrVH6GV?c6ze~`Pkntw?8vQw#R$y>ZC zHg{2c`HJyHL>}FFl)T`!Gu}6`a|TcK?Ce90Z!R()_RkRJe|3(#M+q8vz|kmqRRhkN zp#?vW=(CU-{XWd%p!UBhvy)>|D44FW)I0Kz(Lg3 Y*P8KEQ%w4B^D!iU09qF7=uig$0M|;0-2eap literal 767 zcmVO0z57>;a%v?u>{jZf zr?M>7M%n^O;82ww9A`qT4R&ffu=Lk=930BWZl#_ofp9$I$(#4yn0OVz8WkGuuz;O( z6{K3J;r2HE$YKgs&NZKg!!HR7mpBSvt>G-B-3m$dU}c= zx})!?F|vjaw|BSn;6FY&qvYx6>m*{U^4{v!2$ae?Ue~KKh1JdK2EsFxMsI+_AqgBe zIqmi}vTxJbJWH}S>Xb>y_fOv`Wp$H>K(4j3&hUnwe}q^WVr9+O_GG^a`;Ea;zMKS# z5Gc^PLYk9^2od6H!&Pw-sr=gG&rRRO!z3H0$$XK_rV-0dy8zyLq8(ar6+($lR0F^l z0xsO($dTBKnxY1Owy0da2UJ40%AxUkR;Xa7&9hYNgSdf9ZbT)wXk&m`tW0P|vF1rnr=GaE+kb+VJPIHJn(4niXg*5#|U3F-N7r zv_!?3c-;}?Mchj^>(nCO^~}*UKu*}u!KSU9Y)B9%Hyyi)f=(q)9Sph_YHl59g`|hF zUD3syo!OPmIVnZFEz<;?zM6nPhu$zXyT4S-m!Z}OCMk>bvzAJEIsTcpP9|xOg=y&v zccbdtGxTcEWw#DyB|p7}{Bq>j7r%f`?GEr2wzK0`lgZ}Y>aPU=vPv5#TIb`g_ZwB~ ztAK|?gCj*n3Xybri^kAUkUjR-*z z`nqA`bJ2r=y(<4vZh!ePVt+?|uCQ)^2E_6;9_MPbTs+Rwh^0imAMvr#yBa;`i8*Y2 xE^te>ZiOT8{=dkV?EelX6Bs>Zvxuh0xX^2Xx#5)b?(TieegmcOs&MND002$Hg+c%T diff --git a/man/man1/sourceinstall.1.md b/man/man1/sourceinstall.1.md index 8bef4b4..9565376 100644 --- a/man/man1/sourceinstall.1.md +++ b/man/man1/sourceinstall.1.md @@ -3,7 +3,7 @@ sourceinstall(1) -- install from a source tarball ## SYNOPSIS -`sourceinstall` _tarball_ [`-b` _bootstrap_] [`-f` _flags_] [`-p` _prefix_] [`-d` _destdir_] [`-c` _command_] [`-h`] +`sourceinstall` _tarball_ [`-b` _bootstrap_] [`-f` _flags_] [`-p` _prefix_] [`-d` _destdir_] [`-i` _install_] [`-c` _command_] [`-h`] ## DESCRIPTION @@ -23,6 +23,8 @@ Options may be set multiple times. In all cases, the last one wins. Prefix passed to `./configure`. Shortcut to the `--prefix` flag which will override any `--prefix` set in _flags_. * `-d` _destdir_: Destination directory passed to `make install` as `DESTDIR`. +* `-i` _install_: + Make target to run instead of `install`. * `-c` _command_: Command to run instead of `./configure`, `make`, `make install`. This command is run from the root of the extracted tarball. * `-h`: