This is an automated email from the git hooks/post-receive script.
xguimard-guest pushed a commit to branch master
in repository lemonldap-ng.
commit 39ea2820b04a9eaf49a3f4f1872373e3a3da5532
Author: Xavier Guimard <x.guim...@free.fr>
Date: Sat Mar 5 08:19:46 2016 +0100
Update make variables
---
debian/rules | 46 +++++++++++++++++++++-------------------------
1 file changed, 21 insertions(+), 25 deletions(-)
diff --git a/debian/rules b/debian/rules
index 54a10ff..30c9b4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,50 +6,50 @@
LMSHAREDIR=/usr/share/lemonldap-ng
LMVARDIR =/var/lib/lemonldap-ng
TMP = $(CURDIR)/debian/tmp
-LMDOCDIR =/usr/share/doc/lemonldap-ng-doc
CONFDIR=/etc/lemonldap-ng
SESSIONSDIR=$(LMVARDIR)/sessions
PSESSIONSDIR=$(LMVARDIR)/psessions
NOTIFICATIONSDIR=$(LMVARDIR)/notifications
CONFSTORAGEDIR=$(LMVARDIR)/conf
-FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1
+FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1.js
LMINIFILE=$(CONFDIR)/lemonldap-ng.ini
CAPTCHADIR=$(LMVARDIR)/captcha
-CAPTCHAOUTPUTDIR=$(LMVARDIR)/portal/captcha_output
%:
dh $@ --with systemd
override_dh_auto_configure:
- cd lemonldap-ng-portal/example/skins/dark/ && rm -f redirect.tpl && ln
-s ../common/redirect.tpl
$(MAKE) configure STORAGECONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
PERLOPTIONS="INSTALLDIRS=vendor"
-override_dh_auto_clean:
- cd lemonldap-ng-portal/example/skins/dark/ && rm -f redirect.tpl && ln
-s ../pastel/redirect.tpl
- $(MAKE) clean
+override_dh_auto_build:
+ $(MAKE) all
override_dh_auto_install:
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
- PREFIX=/usr/ \
+ $(MAKE) install install_fr_doc_site \
+ DESTDIR=$(CURDIR)/debian/tmp \
+ PREFIX=/usr \
LMPREFIX=/usr/share/lemonldap-ng/ \
- BINDIR=$(LMSHAREDIR)/bin/ \
+ BINDIR=$(LMSHAREDIR)/bin \
+ SBINDIR=/usr/sbin \
+ FASTCGISOCKDIR=/var/run/llng-fastcgi-server \
DOCUMENTROOT=$(LMVARDIR) \
- EXAMPLESDIR=/examples/ \
- HANDLERDIR=$(LMSHAREDIR)/handler/ \
- PORTALSKINSDIR=$(LMSHAREDIR)/portal-skins/ \
- MANAGERSKINSDIR=$(LMSHAREDIR)/manager-skins/ \
-
SESSIONSEXPLORERDATADIR=$(LMSHAREDIR)/sessions-explorer-imgs/ \
+ EXAMPLESDIR=/examples \
+ HANDLERDIR=$(LMVARDIR)/handler \
+ PORTALSKINSDIR=$(LMSHAREDIR)/portal-skins \
+ MANAGERDIR=$(LMSHAREDIR)/manager \
STORAGECONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
- TOOLSDIR=$(LMSHAREDIR)/ressources/ \
- CONFDIR=/etc/lemonldap-ng/ \
- CRONDIR=/etc/cron.d/ \
+ TOOLSDIR=$(LMSHAREDIR)/ressources \
+ CONFDIR=/etc/lemonldap-ng \
+ CRONDIR=/etc/cron.d \
DATADIR=$(LMVARDIR) \
APACHEVERSION=2.X \
APACHEUSER=www-data \
APACHEGROUP=www-data \
- DEFDOCDIR=$(LMDOCDIR)
+ DEFDOCDIR=/usr/share/doc/lemonldap-ng-doc \
+ FRDOCDIR=/usr/share/doc/lemonldap-ng-fr-doc \
+ PROD=yes
# Removing binary files due to a quilt bug
rm -rf $(TMP)/usr/share/lemonldap-ng/portal-skins/bootstrap/fonts \
@@ -86,17 +86,13 @@ override_dh_fixperms:
debian/*/$(PSESSIONSDIR)/lock \
debian/*/$(NOTIFICATIONSDIR) \
debian/liblemonldap-ng-common-perl/$(CONFSTORAGEDIR) \
- debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR) \
- debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR)/data \
- debian/liblemonldap-ng-portal-perl/$(CAPTCHAOUTPUTDIR)
+ debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR)
chgrp www-data debian/liblemonldap-ng-common-perl/$(LMINIFILE) \
debian/liblemonldap-ng-common-perl/$(FIRSTCONFFILE)
chmod 770 debian/*/$(SESSIONSDIR) debian/*/$(SESSIONSDIR)/lock \
debian/*/$(PSESSIONSDIR) debian/*/$(PSESSIONSDIR)/lock \
debian/*/$(NOTIFICATIONSDIR) \
- debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR) \
- debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR)/data \
- debian/liblemonldap-ng-portal-perl/$(CAPTCHAOUTPUTDIR)
+ debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR)
chmod 750 debian/liblemonldap-ng-common-perl/$(CONFSTORAGEDIR)
chmod 640 debian/liblemonldap-ng-common-perl/$(FIRSTCONFFILE) \
debian/liblemonldap-ng-common-perl/$(LMINIFILE)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
