* Makefile change: Removed the make include file: clixon.mk and clixon.mk.in

* These generated the Makefile variables: clixon_DBSPECDIR, clixon_SYSCONFDIR, clixon_LOCALSTATEDIR, clixon_LIBDIR, clixon_DATADIR which have been replaced by generic autoconf variables instead.
This commit is contained in:
Olof hagsand 2018-07-22 18:33:13 +02:00
parent faea537d25
commit 9776ee864f
16 changed files with 51 additions and 384 deletions

View file

@ -16,7 +16,7 @@ nacmfile=$dir/nacmfile
cat <<EOF > $cfg
<config>
<CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
<CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
<CLICON_YANG_DIR>/usr/local/share/example/yang</CLICON_YANG_DIR>
<CLICON_YANG_MODULE_MAIN>$fyang</CLICON_YANG_MODULE_MAIN>
<CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
<CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>

View file

@ -6,7 +6,7 @@
. ./lib.sh
fyang=$dir/ietf-ip.yang
datastore=datastore_client
datastore=../datastore/datastore_client
cat <<EOF > $fyang
module ietf-ip{

View file

@ -19,9 +19,6 @@ fi
if [ ! -d $dir/www-data ]; then
err $dir/www-data
fi
if [ ! -f $dir/usr/local/share/clixon/clixon.mk ]; then
err $dir/usr/local/share/clixon/clixon.mk
fi
if [ ! -f $dir/usr/local/share/clixon/clixon-config* ]; then
err $dir/usr/local/share/clixon/clixon-config*
fi