Changeset 436 for branches


Ignore:
Timestamp:
10/01/2009 00:04:25 (3 years ago)
Author:
blee
Message:

Merge from trunk new @localstaterundir@.

Fixes #59

Location:
branches/confman-1.9
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/confman-1.9

    • Property svn:mergeinfo changed
      /trunkmerged: 435

  • branches/confman-1.9/Makefile.am

    r418 r436  
    44pkglibexecdir = $(libexecdir)/confman 
    55sysconfdefaultsdir = $(sysconfdir)/defaults 
     6localstaterundir = $(localstatedir)/run 
    67 
    78sbin_SCRIPTS = confman confadmin 
    … …  
    1718                                confexport.8 \ 
    1819                                confsync.8 
     20localstaterun_DATA = 
    1921 
    2022CLEANFILES = $(sbin_SCRIPTS) \ 
    … …  
    4446do_subst = $(SED) -e 's,[@]datadir[@],$(datadir),g' \ 
    4547                -e 's,[@]localstatedir[@],$(localstatedir),g' \ 
     48                -e 's,[@]localstaterundir[@],$(localstaterundir),g' \ 
    4649                -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ 
    4750                -e 's,[@]pkglibexecdir[@],$(pkglibexecdir),g' \ 

  • branches/confman-1.9/confman.conf.in

    r414 r436  
    2020 
    2121# The system lockfile 
    22 LOCKFILE="@localstatedir@/run/confman.lock" 
     22LOCKFILE="@localstaterundir@/confman.lock" 
    2323 
    2424# The script for locking 
Note: See TracChangeset for help on using the changeset viewer.