[omd-commits] OMD Git: omd: make destdir available in skel target

git version control git at mathias-kettner.de
Wed Oct 14 14:57:55 CEST 2015


Module:   omd
Branch:   master
Commit:   eaade7805ef3a551c3ee5fd2890bd690b04cc1be
URL:      http://omdistro.org/projects/omd/repository/revisions/eaade7805ef3a551c3ee5fd2890bd690b04cc1be

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Oct 14 14:28:12 2015 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Oct 14 14:28:12 2015 +0200

make destdir available in skel target

which is the case already on debian but was not set on sles.

---

 Makefile                |    2 +-
 t/20-package_dokuwiki.t |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a5986ce..b9c1cad 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ pack:
             if [ -d "$$p/skel" ] ; then  \
               tar cf - -C $$p/skel --exclude="*~" --exclude=".gitignore" . | tar xvf - -C $(DESTDIR)$(OMD_ROOT)/skel ; \
             fi ;\
-            $(MAKE) SKEL=$(DESTDIR)$(OMD_ROOT)/skel -C $$p skel ;\
+            $(MAKE) DESTDIR=$(DESTDIR) SKEL=$(DESTDIR)$(OMD_ROOT)/skel -C $$p skel ;\
         done
 
         # Create permissions file for skel
diff --git a/t/20-package_dokuwiki.t b/t/20-package_dokuwiki.t
index db47176..db780f6 100644
--- a/t/20-package_dokuwiki.t
+++ b/t/20-package_dokuwiki.t
@@ -12,7 +12,7 @@ BEGIN {
     use lib "$FindBin::Bin/lib/lib/perl5";
 }
 
-plan( tests => 28 );
+plan( tests => 32 );
 
 ##################################################
 # create our test site
@@ -28,6 +28,7 @@ my $tests = [
   { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/wiki -e 301'",          like => '/HTTP OK:/' },
   { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/wiki/ -e 302'",         like => '/HTTP OK:/' },
   { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/wiki/doku.php -e 200'", like => '/HTTP OK:/' },
+  { cmd => "/bin/su - $site -c 'test -h var/dokuwiki/lib/plugins/acl'", like => '//' },
 
   { cmd => $omd_bin." stop $site" },
 ];



More information about the omd-commits mailing list