* Fix autogen.sh
authorpancake<nopcode.org>
Tue Jul 12 10:30:18 2011 +0200 (10 months ago)
changeset 41c1dc214fa218
parent 40 24b606c6692b
child 42 401420d52f1c
* Fix autogen.sh
* Use DESTDIR
* Install acr-install
Makefile.acr
autogen.sh
configure
src/acr-install
     1.1 --- a/Makefile.acr	Tue Jul 12 09:38:37 2011 +0200
     1.2 +++ b/Makefile.acr	Tue Jul 12 10:30:18 2011 +0200
     1.3 @@ -1,10 +1,11 @@
     1.4  #VPATH=@VPATH@
     1.5 +DESTDIR?=
     1.6  INSTALL_SCRIPT?=@INSTALL_SCRIPT@
     1.7  INSTALL_DATA?=@INSTALL_DATA@
     1.8  INSTALL_MAN?=@INSTALL_DATA@
     1.9 -BINDIR?=@BINDIR@
    1.10 -MANDIR?=@MANDIR@
    1.11 -DATADIR?=@DATADIR@
    1.12 +BINDIR=${DESTDIR}/@BINDIR@
    1.13 +MANDIR=${DESTDIR}/@MANDIR@
    1.14 +DATADIR=${DESTDIR}/@DATADIR@
    1.15  VERSION=@VERSION@
    1.16  .PHONY: all todo test install deinstall dist clean mrproper
    1.17  
    1.18 @@ -25,7 +26,7 @@
    1.19  	sed -e 's,@''VERSION@,${VERSION},g' src/acr-sh > ${BINDIR}/acr-sh
    1.20  	chmod +x ${BINDIR}/acr-sh
    1.21  	${INSTALL_SCRIPT} src/amr ${BINDIR}/amr
    1.22 -	#${INSTALL_SCRIPT} ${VPATH}/src/install-acr ${BINDIR}/install-acr
    1.23 +	${INSTALL_SCRIPT} src/acr-install ${BINDIR}/acr-install
    1.24  	${INSTALL_SCRIPT} src/acr-cat ${BINDIR}/acr-cat
    1.25  	mkdir -p ${MANDIR}/man1/ ${MANDIR}/man5/
    1.26  	${INSTALL_MAN} man/man1/acr.1 ${MANDIR}/man1/
     2.1 --- a/autogen.sh	Tue Jul 12 09:38:37 2011 +0200
     2.2 +++ b/autogen.sh	Tue Jul 12 10:30:18 2011 +0200
     2.3 @@ -2,8 +2,12 @@
     2.4  #
     2.5  # autogen script to create configure
     2.6   
     2.7 -PATH=./src:${PATH}
     2.8 -./configure $@
     2.9 -chmod +x ./src/acr ./src/acr-sh ./src/acr-cat
    2.10 +PATH=./.bin/bin:${PATH}
    2.11 +rm -rf .bin
    2.12 +mkdir .bin
    2.13 +./configure --prefix=/ $@
    2.14 +chmod +x ./src/acr ./src/acr-sh ./src/acr-cat ./src/acr-install
    2.15 +make install DESTDIR=$PWD/.bin
    2.16  acr -e -p
    2.17  make clean
    2.18 +rm -rf .bin
     3.1 --- a/configure	Tue Jul 12 09:38:37 2011 +0200
     3.2 +++ b/configure	Tue Jul 12 10:30:18 2011 +0200
     3.3 @@ -308,3 +308,17 @@
     3.4  [ -z "${VAL}" ] && VAL="(null)"
     3.5  echo " - ${A} = ${VAL}"
     3.6  done
     3.7 +#ACR# (( package information ))
     3.8 +#ACR# PKGNAME acr
     3.9 +#ACR# VERSION 0.8.6
    3.10 +#ACR# CONTACT pancake ; @nopcode.org
    3.11 +#ACR# 
    3.12 +#ACR# (( needed programs ))
    3.13 +#ACR# CHECK_PROGRAM INSTALL install
    3.14 +#ACR# 
    3.15 +#ACR# (( directories ))
    3.16 +#ACR# SUBDIRS . src/vim/install.sh ;
    3.17 +#ACR# (( src/acr src/acr-sh ))
    3.18 +#ACR# 
    3.19 +#ACR# (( final report ))
    3.20 +#ACR# REPORT SPREFIX PREFIX INSTALL VERSION CONTACT ;