renamed "plugins/" into "plugconf/"

ssinyagin · Sep 19, 2011 · e69e6b3 · e69e6b3
1 parent 3131d0c
commit e69e6b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -25,7 +25,7 @@ noinst_SCRIPTS = \
 	setup_tools/substvars.sh
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
+	$(mkinstalldirs) $(DESTDIR)$(plugconfdir)
 
 
 dist-hook:

diff --git a/bin/gerty.in b/bin/gerty.in
@@ -48,7 +48,7 @@ $Gerty::external_executables{'telnet'} = '@TELNET@';
 
 # Read plugin configurations
 {
-    my $dir = '@plugindir@';
+    my $dir = '@plugconfdir@';
     opendir(CFGDIR, $dir) or die("Cannot open directory $dir: $!");
     my @files = grep { /\.init\.pl$/ } readdir(CFGDIR);
     closedir( CFGDIR );

diff --git a/configure.ac b/configure.ac
@@ -84,9 +84,9 @@ AC_ARG_VAR(pkgdatadir, [[DATADIR/gerty] Gerty data directory])
 if test -z "$pkgdatadir"; then
    pkgdatadir='${datadir}/gerty'; fi
 
-AC_ARG_VAR(plugindir, [[PKGDATADIR/plugins] Plugin configuration directory])
-if test -z "$plugindir"; then
-   plugindir='${pkgdatadir}/plugins'; fi
+AC_ARG_VAR(plugconfdir, [[PKGDATADIR/plugconf] Plugin configuration directory])
+if test -z "$plugconfdir"; then
+   plugconfdir='${pkgdatadir}/plugconf'; fi
 
 AC_ARG_VAR(devclassdir, [[PKGDATADIR/devclasses] Device classes directory])
 if test -z "$devclassdir"; then

diff --git a/setup_tools/substvars.sh.in b/setup_tools/substvars.sh.in
@@ -40,7 +40,7 @@ pkgdatadir=@pkgdatadir@
     -e "s,\@perllibdir\@,${perllibdir},g" \
     -e "s,\@perllibdirs\@,@perllibdirs@,g" \
     -e "s,\@pkgdatadir\@,@pkgdatadir@,g" \
-    -e "s,\@plugindir\@,@plugindir@,g" \
+    -e "s,\@plugconfdir\@,@plugconfdir@,g" \
     -e "s,\@devclassdir\@,@devclassdir@,g" \
     $1