Changeset 302


Ignore:
Timestamp:
01/24/2009 23:49:44 (3 years ago)
Author:
blee
Message:

This is the big commit to use GNU Autotools. However, Makefile.am
could use some serious cleanup.

Also:

  • abspath installed to libexec/confman
  • ABSPATH created as a defaults variable
  • confman_completions renamed to confman_completion
  • confman_completion installed to etc/bash_completion.d so it is automagically recognized by the system bash_completion

See #6

Location:
trunk
Files:
2 deleted
3 edited
8 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.am

    r300 r302  
     1bashcompdir = $(sysconfdir)/bash_completion.d 
    12pkglibexecdir = $(libexecdir)/confman 
    2 pkgsysconfdir = $(sysconfdir)/confman 
     3sysconfdefaultsdir = $(sysconfdir)/defaults 
    34 
    4 bin_SCRIPTS = abspath 
    55sbin_SCRIPTS = confman 
    6 pkglibexec_SCRIPTS = confexport confsync confaudit conflock 
    7 pkgdata_SCRIPTS = confmanlib.sh confmandoc.sh confmancommon.sh 
    8 pkgsysconf_DATA = confman_completions confman.conf defaults.conf 
    9 man_MANS = confaudit.8 confexport.8 confman.8 confman.conf.5 confsync.8 
     6pkglibexec_SCRIPTS = confexport confsync confaudit 
     7dist_pkglibexec_SCRIPTS = conflock abspath 
     8pkgdata_SCRIPTS = confmancommon.sh 
     9dist_pkgdata_SCRIPTS = confmanlib.sh confmandoc.sh 
     10dist_sysconf_DATA = confman.conf.sample 
     11sysconfdefaults_DATA = confman.conf 
     12bashcomp_DATA = confman_completion 
     13dist_man_MANS = confaudit.8 confexport.8 confman.8 confman.conf.5 confsync.8 
    1014 
     15CLEANFILES = $(sbin_SCRIPTS) \ 
     16                $(pkglibexec_SCRIPTS) \ 
     17                $(pkgdata_SCRIPTS) \ 
     18                $(sysconfdefaults_DATA) \ 
     19                $(bashcomp_DATA) 
     20 
     21EXTRA_DIST = confman.in \ 
     22                confexport.in \ 
     23                confsync.in \ 
     24                confaudit.in \ 
     25                confmancommon.sh.in \ 
     26                confman.conf.in \ 
     27                confman_completion.in \ 
     28                LICENSE 
     29 
     30do_subst = $(SED) -e 's,[@]datadir[@],$(datadir),g' \ 
     31                -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ 
     32                -e 's,[@]pkglibexecdir[@],$(pkglibexecdir),g' \ 
     33                -e 's,[@]sbindir[@],$(sbindir),g' \ 
     34                -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ 
     35                -e 's,[@]sysconfdefaultsdir[@],$(sysconfdefaultsdir),g' 
     36 
     37confman: confman.in Makefile 
     38        $(do_subst) < confman.in > confman 
     39 
     40confexport: confexport.in Makefile 
     41        $(do_subst) < confexport.in > confexport 
     42 
     43confsync: confsync.in Makefile 
     44        $(do_subst) < confsync.in > confsync 
     45 
     46confaudit: confaudit.in Makefile 
     47        $(do_subst) < confaudit.in > confaudit 
     48 
     49confmancommon.sh: confmancommon.sh.in Makefile 
     50        $(do_subst) < confmancommon.sh.in > confmancommon.sh 
     51 
     52confman.conf: confman.conf.in Makefile 
     53        $(do_subst) < confman.conf.in > confman.conf 
     54 
     55confman_completion: confman_completion.in Makefile 
     56        $(do_subst) < confman_completion.in > confman_completion 
     57 

  • trunk/confaudit.in

    r299 r302  
    2828 
    2929 
    30 if [ -r ${PREFIX}/share/confman/confmancommon.sh ] ; then 
    31     . ${PREFIX}/share/confman/confmancommon.sh 
     30if [ -r @pkgdatadir@/confmancommon.sh ] ; then 
     31    . @pkgdatadir@/confmancommon.sh 
    3232else 
    3333    echo "Can't find confmancommon.sh. Exiting." >&2 

  • trunk/confexport.in

    r301 r302  
    3333# tarball. 
    3434 
    35 if [ -r ${PREFIX}/share/confman/confmancommon.sh ] ; then 
    36     . ${PREFIX}/share/confman/confmancommon.sh 
     35if [ -r @pkgdatadir@/confmancommon.sh ] ; then 
     36    . @pkgdatadir@/confmancommon.sh 
    3737else 
    3838    echo "Can't find confmancommon.sh. Exiting." >&2 

  • trunk/configure.ac

    r298 r302  
    11AC_PREREQ(2.62) 
    22AC_INIT([confman], [1.9.a], [confman-bugs@timesinks.net]) 
    3 AM_INIT_AUTOMAKE 
     3AM_INIT_AUTOMAKE([foreign]) 
    44 
    55# Checks for programs. 

  • trunk/confman.conf.in

    r301 r302  
    1010 
    1111# The location of our shell library 
    12 REPO_LIBRARY="${PREFIX}/share/confman/confmanlib.sh" 
     12REPO_LIBRARY="@pkgdatadir@/confmanlib.sh" 
    1313 
    1414# The location of our shell's documentation library 
    15 REPO_DOCS="${PREFIX}/share/confman/confmandoc.sh" 
     15REPO_DOCS="@pkgdatadir@/confmandoc.sh" 
    1616 
    1717# The system lockfile 
    … …  
    1919 
    2020# The script for locking 
    21 LOCK="${PREFIX}/libexec/confman/conflock.sh" 
     21LOCK="@pkglibexecdir@/conflock" 
     22 
     23# The abspath script 
     24ABSPATH="@pkglibexecdir@/abspath" 
    2225 
    2326# The directory from the root of the repository to our checkpoints: 

  • trunk/confman.in

    r278 r302  
    3030#       Print help and usage information 
    3131 
    32 if [ -r ${PREFIX}/share/confman/confmancommon.sh ] ; then 
    33     . ${PREFIX}/share/confman/confmancommon.sh 
     32if [ -r @pkgdatadir@/confmancommon.sh ] ; then 
     33    . @pkgdatadir@/confmancommon.sh 
    3434else 
    3535    echo "Can't find confmancommon.sh. Exiting." >&2 
    … …  
    246246    $SUDO ${SUDO:+-v} 
    247247    if [ -r $1 ] ; then 
    248         file=`abspath $1` 
     248        file=`$ABSPATH $1` 
    249249    else 
    250250        # If we can't enter the parent directory, this will help us 
    251251        # get the info we need. 
    252         file=`$SUDO abspath $1` 
     252        file=`$SUDO $ABSPATH $1` 
    253253    fi 
    254254    shift 
    … …  
    390390        local group=$DEFAULT_GROUP 
    391391        local comment="dir" 
    392         local workdir=`abspath .` 
     392        local workdir=`$ABSPATH .` 
    393393 
    394394        if [ -z "$dir" ] ; then 
    … …  
    449449 
    450450        if [ -z $1 ] ; then  
    451                 file=`abspath .` 
     451                file=`$ABSPATH .` 
    452452        else 
    453                 file=`abspath $1` 
     453                file=`$ABSPATH $1` 
    454454        fi 
    455455        echo -e "--------------------------------------------------------" 

  • trunk/confman_completion.in

    r266 r302  
    3838 
    3939        # Setup ConfMan specific vars 
    40         CONFMAN="${PREFIX}/sbin/confman" 
    41         CONFMAN_CONF="${PREFIX}/etc/confman.conf" 
    42         CONFMAN_RC="~/.confmanrc" 
     40        CONFMAN="@sbindir@/confman" 
     41        CONFMAN_CONF="@sysconfdir@/confman.conf" 
     42        CONFMAN_RC=~/.confmanrc 
    4343        if [ -e ${CONFMAN_RC} ] ; then 
    4444                RECIPE_PATH=$(grep '^RECIPE_PATH' ${CONFMAN_RC}|cut -d'"' -f2) 

  • trunk/confmancommon.sh.in

    r284 r302  
    3030 
    3131# Some global definitions. Defaults that can be overriden by options. 
    32 DEFAULTS="${PREFIX}/etc/defaults/confman.conf" 
    33 GCONF="${PREFIX}/etc/confman.conf" 
     32DEFAULTS="@sysconfdefaultsdir@/confman.conf" 
     33GCONF="@sysconfdir@/confman.conf" 
    3434UCONF="${HOME}/.confmanrc" 
    3535MYNAME=`basename $0` 

  • trunk/confmanlib.sh

    r301 r302  
    236236        local module="$1" 
    237237        shift 
    238         local file=`abspath $1` 
     238        local file=`$ABSPATH $1` 
    239239        shift 
    240240        local moduledir="${WORK_PATH}/$module" 

  • trunk/confsync.in

    r299 r302  
    3131# configuration pulling mechanism. 
    3232 
    33 if [ -r ${PREFIX}/share/confman/confmancommon.sh ] ; then 
    34     . ${PREFIX}/share/confman/confmancommon.sh 
     33if [ -r @pkgdatadir@/confmancommon.sh ] ; then 
     34    . @pkgdatadir@/confmancommon.sh 
    3535else 
    3636    echo "Can't find confmancommon.sh. Exiting." >&2 
Note: See TracChangeset for help on using the changeset viewer.