Manager corrections for manual installation (make && make install)

build/lemonldap-ng/Makefile

@@ -268,8 +268,7 @@ install_manager_site:	install_conf_dir
 	done
 	@find ${RSESSIONSEXPLORERDIR} -type l -name images -delete
 	@cp -pR --remove-destination ${SRCMANAGERDIR}/example/index.pl ${RMANAGERDIR}
-	@perl -i -pe 's#__SKINDIR__#$(MANAGERDIR)/skins#; \
-		s#__APPSXMLFILE__#$(CONFDIR)/apps-list.xml#;' ${RMANAGERDIR}/index.pl
+	@perl -i -pe 's#__MANAGERDIR__#$(MANAGERDIR)#' ${RMANAGERDIR}/index.pl
 	@cp -pR --remove-destination ${SRCMANAGERDIR}/example/skins/* $(RMANAGERSKINSDIR)
 	@if [ "$(MANAGERDIR)/skins/" != "$(MANAGERSKINSDIR)/" ]; then \
 		for skin in $$(ls lemonldap-ng-manager/example/skins/); do \
@@ -279,7 +278,8 @@ install_manager_site:	install_conf_dir
 	fi
 	@perl -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(RCONFDIR)/$(CONFFILENAME)
 	# Sessions explorer install
-	@cp -pR --remove-destination ${SRCMANAGERDIR}/example/{sessions.pl,images} $(RSESSIONSEXPLORERDIR)
+	@cp -pR --remove-destination ${SRCMANAGERDIR}/example/sessions.pl $(RSESSIONSEXPLORERDIR)
+	@cp -pR --remove-destination ${SRCMANAGERDIR}/example/images $(RSESSIONSEXPLORERDIR)
 	@if [ "${SESSIONSEXPLORERDIR}/images/" != "${SESSIONSEXPLORERDATADIR}/" ]; then \
 		mv -f ${RSESSIONSEXPLORERDIR}/images/* ${RSESSIONSEXPLORERDATADIR}; \
 		rm -rf ${RMANAGERDIR}/images; \

modules/lemonldap-ng-manager/MANIFEST

@@ -17,7 +17,6 @@ example/images/line_bg_over.gif
 example/images/line_bg_over_last.gif
 example/images/logo_lemonldap-ng.png
 example/images/manager.css
-example/images/manager.js
 example/images/minus.gif
 example/images/page_add.png
 example/images/page_delete.png
@@ -54,6 +53,7 @@ example/skins/default/line_bg_over.gif
 example/skins/default/line_bg_over_last.gif
 example/skins/default/logo_lemonldap-ng.png
 example/skins/default/manager.css
+example/skins/default/manager.js
 example/skins/default/manager.tpl
 example/skins/default/minus.gif
 example/skins/default/page_add.png

modules/lemonldap-ng-manager/example/index.pl

@@ -4,13 +4,13 @@ use strict;
 use Lemonldap::NG::Manager;
 use HTML::Template;
 our $skin_dir='skins';
-our $main_dir='/var/lib/lemonldap-ng/manager';
+our $main_dir='__MANAGERDIR__';
 our $skin='default';
 
 my $manager = new Lemonldap::NG::Manager(
     {
         # REQUIRED PARAMETERS
-        applyConfFile           => '/etc/lemonldap-ng//apply.conf',
+        applyConfFile           => '/etc/lemonldap-ng/apply.conf',
 
         # ACCESS TO CONFIGURATION