Ignore:
Timestamp:
05/06/2009 21:08:30 (3 years ago)
Author:
ccowart
Message:

Merging completion re-enable from trunk.

Location:
branches/confman-1.9
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/confman-1.9

    • Property svn:mergeinfo changed
      /trunkmerged: 330

  • branches/confman-1.9/Makefile.am

    r328 r331  
    1 #bashcompdir = $(sysconfdir)/bash_completion.d 
     1bashcompdir = $(sysconfdir)/bash_completion.d 
    22pkglibexecdir = $(libexecdir)/confman 
    33sysconfdefaultsdir = $(sysconfdir)/defaults 
    … …  
    99sysconf_DATA = confman.conf.sample 
    1010sysconfdefaults_DATA = confman.conf 
    11 #bashcomp_DATA = confman_completion 
     11bashcomp_DATA = confman_completion 
    1212man_MANS = confman.8 confman.conf.5 
    1313dist_man_MANS = confadmin.8 \ 
    … …  
    2222                $(sysconfdefaults_DATA) \ 
    2323                $(man_MANS) 
    24 #               $(bashcomp_DATA) 
     24                $(bashcomp_DATA) 
    2525 
    2626EXTRA_DIST = abspath.in \ 
Note: See TracChangeset for help on using the changeset viewer.