[Fedora-directory-commits] dsgw cgidbgwrapper.sh.in, NONE, 1.1 Makefile.am, 1.6, 1.7 configure.ac, 1.5, 1.6 dsgw.h, 1.4, 1.5 lang.c, 1.2, 1.3 tutor.c, 1.2, 1.3 aclocal.m4, 1.3, 1.4 configure, 1.6, 1.7 missing, 1.2, 1.3 install-sh, 1.2, 1.3 depcomp, 1.2, 1.3 config.sub, 1.2, 1.3 config.guess, 1.2, 1.3 compile, 1.2, 1.3 Makefile.in, 1.6, 1.7
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Wed Jan 16 22:56:04 UTC 2008
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23442/dsgw
Modified Files:
Makefile.am configure.ac dsgw.h lang.c tutor.c aclocal.m4
configure missing install-sh depcomp config.sub config.guess
compile Makefile.in
Added Files:
cgidbgwrapper.sh.in
Log Message:
added manuals; fixed code that displays manuals; added initial tests
--- NEW FILE cgidbgwrapper.sh.in ---
#!/bin/sh
PROG=@progname at .orig
inf=/tmp/$PROG.in.$$
outf=/tmp/$PROG.out.$$
env > /tmp/env
echo "set env LD_LIBRARY_PATH @prefix@/lib:@libdir@:/usr/lib64:/usr/lib" > .gdbinit
echo "break main" >> .gdbinit
if [ "$REQUEST_METHOD" = POST ] ; then
cat - > $inf
echo "run < $inf > $outf" >> .gdbinit
else
rm -f $inf
echo "run > $outf" >> .gdbinit
fi
DISPLAY=:0.0 LD_LIBRARY_PATH=@prefix@/lib xterm -bg white -fn 10x20 -title gdb -e gdb -x .gdbinit $PROG
cat $outf
rm -f $inf $outf
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am 14 Jan 2008 22:58:30 -0000 1.6
+++ Makefile.am 16 Jan 2008 22:56:02 -0000 1.7
@@ -36,6 +36,11 @@
# relative to $localstatedir
cookiedir=$(localstatedir)@cookiedir@
perldir = $(libdir)@perldir@
+manualdir = $(datadir)@manualdir@
+manualsubdir = @manualsubdir@
+gwinfodir = $(manualdir)/en/$(manualsubdir)/info
+# this is the directory where the manuals will actually be installed
+maninstdir = $(manualdir)/en/$(manualsubdir)
DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)"
@@ -52,7 +57,8 @@
-DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \
-DCGIBINDIR=\"$(cgibindir)\" -DCONTEXTDIR=\"$(contextdir)\" \
-DINSTCONFIGDIR=\"$(instconfigdir)\" -DMANUALDIR=\"$(manualdir)\" \
- -DCGIURIBASE=\"$(cgiuri)\"
+ -DCGIURIBASE=\"$(cgiuri)\" -DMANUALSUBDIR=\"$(manualsubdir)\" \
+ -DINFODIR=\"$(gwinfodir)\"
LIBS = @adminutil_lib@ -ladmsslutil at adminutil_ver@ -ladminutil at adminutil_ver@ \
@icu_lib@ -licui18n -licuuc -licudata \
@@ -70,6 +76,10 @@
cgibin_PROGRAMS = auth doauth edit domodify dnedit dosearch $(NEED_SECGLUE) $(CKUTILPROGS)
cgibin_SCRIPTS = orgbin/org orgbin/myorg
+if DEBUG
+DBGSCRIPTS = $(addsuffix .sh,$(cgibin_PROGRAMS))
+cgibin_SCRIPTS += $(DBGSCRIPTS)
+endif
noinst_PROGRAMS = propmaker
# I need propmaker to build with no libraries - I don't know of any other way to set
@@ -176,6 +186,13 @@
pbconfig/display-room.html \
pbconfig/dsgwfilter.conf pbconfig/pb.tmpl
+dist_maninst_DATA = \
+ html/manual/a.gif html/manual/add.htm html/manual/attribua.gif html/manual/attribut.htm html/manual/auth.htm \
+ html/manual/contents.html html/manual/intro.htm html/manual/mod.htm html/manual/n.gif \
+ html/manual/objclass.htm html/manual/search.htm html/manual/t.gif html/manual/y.gif html/manual/index.map
+
+dist_gwinfo_DATA = html/info/infonav.html
+
nodist_context_DATA = dsgw-httpd.conf
#nodist_context_SCRIPTS = setup-dirsrv-gw
@@ -251,7 +268,8 @@
-e 's, at instconfigdir\@,$(instconfigdir),g' \
-e 's, at perlpath\@,$(perldir),g' \
-e 's, at perlexec\@, at perlexec@,g' \
- -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
+ -e 's, at manualdir\@,$(manualdir),g' \
+ -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
@@ -261,6 +279,12 @@
-e 's, at capbrand\@,$(capbrand),g' \
-e 's, at vendor\@,$(vendor),g'
+if DEBUG
+$(DBGSCRIPTS) : cgidbgwrapper.sh.in
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(fixupcmd) $< > $@
+endif
+
% : %.in
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
$(fixupcmd) $< > $@
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/dsgw/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.ac 14 Jan 2008 22:31:17 -0000 1.5
+++ configure.ac 16 Jan 2008 22:56:02 -0000 1.6
@@ -111,6 +111,7 @@
bundle="";
])
AM_CONDITIONAL(BUNDLE,test "$bundle" = "1")
+AM_CONDITIONAL(DEBUG,test "$enable_debug" = "yes")
# libtool automatically adds --rpath $libdir to each executable, and
# there is apparently no standard way to disable this. Also, you cannot
@@ -236,7 +237,10 @@
orghtmldir=/$PACKAGE_NAME/orghtml
configdir=/$PACKAGE_NAME/config
pbconfigdir=/$PACKAGE_NAME/pbconfig
- manualuri=/$PACKAGE_NAME/manual
+ # root directory for all manuals
+ manualdir=/$PACKAGE_NAME/manual
+ # the actual manual files are installed here under the lang directory
+ manualsubdir=
propertydir=/$PACKAGE_NAME/properties
# relative to libdir
cgibindir=/$PACKAGE_NAME/cgi-bin
@@ -248,7 +252,10 @@
orghtmldir=/dsgw/orghtml
configdir=/dsgw/config
pbconfigdir=/dsgw/pbconfig
- manualuri=/dsgw/manual
+ # root directory for all manuals
+ manualdir=/manual
+ # the actual manual files are installed here under the lang directory
+ manualsubdir=dsgw
propertydir=/properties/dsgw
# relative to libdir
perldir=/perl
@@ -261,7 +268,10 @@
orghtmldir=/$PACKAGE_BASE_NAME/dsgw/orghtml
configdir=/$PACKAGE_BASE_NAME/dsgw/config
pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig
- manualuri=/$PACKAGE_BASE_NAME/dsgw/manual
+ # root directory for all manuals
+ manualdir=/$PACKAGE_BASE_NAME/manual
+ # the actual manual files are installed here under the lang directory
+ manualsubdir=dsgw
propertydir=/$PACKAGE_BASE_NAME/properties/dsgw
# relative to libdir
perldir=/$PACKAGE_BASE_NAME/perl
@@ -327,6 +337,8 @@
AC_SUBST(securitydir)
AC_SUBST(cookiedir)
AC_SUBST(perldir)
+AC_SUBST(manualdir)
+AC_SUBST(manualsubdir)
# need a check here to see if the ldif functions are exported from libldap
# for now, just assume they are not
Index: dsgw.h
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgw.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dsgw.h 14 Jan 2008 22:58:30 -0000 1.4
+++ dsgw.h 16 Jan 2008 22:56:02 -0000 1.5
@@ -110,7 +110,8 @@
#define DSGW_DOCDIR_HTTP HTMLDIR
#define DSGW_CONTEXTDIR_HTTP (getenv("DSGW_CONTEXT_DIR") ? getenv("DSGW_CONTEXT_DIR") : CONTEXTDIR)
#define DSGW_HTMLDIR HTMLDIR
-#define DSGW_MANROOT MANUALDIR
+#define DSGW_MANROOT MANUALDIR "/"
+#define DSGW_MANSUBDIR MANUALSUBDIR "/"
#define DSGW_MANUALSHORTCUT ".MANUAL"
#define DSGW_MANUALSHORTCUT_LEN 7
Index: lang.c
===================================================================
RCS file: /cvs/dirsec/dsgw/lang.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lang.c 14 Jan 2008 22:58:30 -0000 1.2
+++ lang.c 16 Jan 2008 22:56:02 -0000 1.3
@@ -206,7 +206,7 @@
}
}
- helpdir = dsgw_file2path ( DSGW_MANROOT, "slapd/gw/manual/" );
+ helpdir = dsgw_file2path ( DSGW_MANROOT, DSGW_MANSUBDIR );
tfname = (char *)dsgw_ch_malloc( strlen( helpdir ) +
strlen( mandocname ) +
1 );
Index: tutor.c
===================================================================
RCS file: /cvs/dirsec/dsgw/tutor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tutor.c 14 Jan 2008 22:58:30 -0000 1.2
+++ tutor.c 16 Jan 2008 22:56:02 -0000 1.3
@@ -47,7 +47,7 @@
#define BASE_MAN_DIRECTORY "manual/"
#define BASE_INFO_DIRECTORY "info/"
-#define HELP_INDEX_HTML "manual/index.html"
+#define HELP_INDEX_HTML "index.html"
/*#define MANUAL_HPATH "bin/lang?file=" DSGW_MANUALSHORTCUT "/"*/
/* Copied from ldapserver/lib/base/util.c */
@@ -93,7 +93,7 @@
char *mypath;
char *p;
- p = dsgw_file2path( DSGW_MANROOT, "slapd/gw/" );
+ p = dsgw_file2path( DSGW_MANROOT, DSGW_MANSUBDIR );
mypath = (char *)dsgw_ch_malloc( strlen( p ) +
strlen( filename ) + 1 );
sprintf( mypath, "%s%s", p, filename );
@@ -184,7 +184,7 @@
FILE *map=NULL;
char *man_index=NULL;
- man_index = dsgw_file2path ( DSGW_MANROOT, "slapd/gw/manual/index.map" );
+ man_index = dsgw_file2path ( DSGW_MANROOT, DSGW_MANSUBDIR "index.map" );
html[0]='\0';
Index: configure
===================================================================
RCS file: /cvs/dirsec/dsgw/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure 14 Jan 2008 22:58:30 -0000 1.6
+++ configure 16 Jan 2008 22:56:02 -0000 1.7
@@ -466,7 +466,7 @@
#endif"
ac_default_prefix=/opt/dirsrv
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri dsgwuri orguri pburi propertydir htmldir pbhtmldir orghtmldir configdir pbconfigdir contextdir securitydir cookiedir perldir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE DEBUG_TRUE DEBUG_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri dsgwuri orguri pburi propertydir htmldir pbhtmldir orghtmldir configdir pbconfigdir contextdir securitydir cookiedir perldir manualdir manualsubdir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -21146,6 +21146,16 @@
fi
+
+if test "$enable_debug" = "yes"; then
+ DEBUG_TRUE=
+ DEBUG_FALSE='#'
+else
+ DEBUG_TRUE='#'
+ DEBUG_FALSE=
+fi
+
+
# libtool automatically adds --rpath $libdir to each executable, and
# there is apparently no standard way to disable this. Also, you cannot
# override rpath with LD_LIBRARY_PATH, so this causes problems if you have
@@ -21509,7 +21519,10 @@
orghtmldir=/$PACKAGE_NAME/orghtml
configdir=/$PACKAGE_NAME/config
pbconfigdir=/$PACKAGE_NAME/pbconfig
- manualuri=/$PACKAGE_NAME/manual
+ # root directory for all manuals
+ manualdir=/$PACKAGE_NAME/manual
+ # the actual manual files are installed here under the lang directory
+ manualsubdir=
propertydir=/$PACKAGE_NAME/properties
# relative to libdir
cgibindir=/$PACKAGE_NAME/cgi-bin
@@ -21521,7 +21534,10 @@
orghtmldir=/dsgw/orghtml
configdir=/dsgw/config
pbconfigdir=/dsgw/pbconfig
- manualuri=/dsgw/manual
+ # root directory for all manuals
+ manualdir=/manual
+ # the actual manual files are installed here under the lang directory
+ manualsubdir=dsgw
propertydir=/properties/dsgw
# relative to libdir
perldir=/perl
@@ -21534,7 +21550,10 @@
orghtmldir=/$PACKAGE_BASE_NAME/dsgw/orghtml
configdir=/$PACKAGE_BASE_NAME/dsgw/config
pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig
- manualuri=/$PACKAGE_BASE_NAME/dsgw/manual
+ # root directory for all manuals
+ manualdir=/$PACKAGE_BASE_NAME/manual
+ # the actual manual files are installed here under the lang directory
+ manualsubdir=dsgw
propertydir=/$PACKAGE_BASE_NAME/properties/dsgw
# relative to libdir
perldir=/$PACKAGE_BASE_NAME/perl
@@ -22628,6 +22647,8 @@
+
+
# need a check here to see if the ldif functions are exported from libldap
# for now, just assume they are not
@@ -22815,6 +22836,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"DEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${CXXLINK_REQUIRED_TRUE}" && test -z "${CXXLINK_REQUIRED_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"CXXLINK_REQUIRED\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23457,6 +23485,8 @@
s, at instconfigdir@,$instconfigdir,;t t
s, at BUNDLE_TRUE@,$BUNDLE_TRUE,;t t
s, at BUNDLE_FALSE@,$BUNDLE_FALSE,;t t
+s, at DEBUG_TRUE@,$DEBUG_TRUE,;t t
+s, at DEBUG_FALSE@,$DEBUG_FALSE,;t t
s, at LIBSOCKET@,$LIBSOCKET,;t t
s, at LIBNSL@,$LIBNSL,;t t
s, at LIBCSTD@,$LIBCSTD,;t t
@@ -23505,6 +23535,8 @@
s, at securitydir@,$securitydir,;t t
s, at cookiedir@,$cookiedir,;t t
s, at perldir@,$perldir,;t t
+s, at manualdir@,$manualdir,;t t
+s, at manualsubdir@,$manualsubdir,;t t
s, at NEED_LDIF_TRUE@,$NEED_LDIF_TRUE,;t t
s, at NEED_LDIF_FALSE@,$NEED_LDIF_FALSE,;t t
s, at WINNT_TRUE@,$WINNT_TRUE,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 14 Jan 2008 22:58:30 -0000 1.6
+++ Makefile.in 16 Jan 2008 22:56:02 -0000 1.7
@@ -63,13 +63,15 @@
cgibin_PROGRAMS = auth$(EXEEXT) doauth$(EXEEXT) edit$(EXEEXT) \
domodify$(EXEEXT) dnedit$(EXEEXT) dosearch$(EXEEXT) \
$(am__EXEEXT_1)
+ at DEBUG_TRUE@am__append_3 = $(DBGSCRIPTS)
noinst_PROGRAMS = propmaker$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \
- $(dist_html_DATA) $(dist_orghtml_DATA) $(dist_pbconfig_DATA) \
- $(dist_pbhtml_DATA) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS ChangeLog NEWS compile \
- config.guess config.sub depcomp install-sh ltmain.sh missing
+ $(dist_gwinfo_DATA) $(dist_html_DATA) $(dist_maninst_DATA) \
+ $(dist_orghtml_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \
+ ChangeLog NEWS compile config.guess config.sub depcomp \
+ install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \
@@ -86,7 +88,8 @@
am__EXEEXT_1 = unauth$(EXEEXT) search$(EXEEXT) csearch$(EXEEXT) \
newentry$(EXEEXT) tutor$(EXEEXT) lang$(EXEEXT)
am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" \
- "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(gwinfodir)" \
+ "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(maninstdir)" \
"$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" \
"$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" \
"$(DESTDIR)$(propertydir)"
@@ -171,13 +174,16 @@
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
dist_configDATA_INSTALL = $(INSTALL_DATA)
+dist_gwinfoDATA_INSTALL = $(INSTALL_DATA)
dist_htmlDATA_INSTALL = $(INSTALL_DATA)
+dist_maninstDATA_INSTALL = $(INSTALL_DATA)
dist_orghtmlDATA_INSTALL = $(INSTALL_DATA)
dist_pbconfigDATA_INSTALL = $(INSTALL_DATA)
dist_pbhtmlDATA_INSTALL = $(INSTALL_DATA)
nodist_contextDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_config_DATA) $(dist_html_DATA) $(dist_orghtml_DATA) \
+DATA = $(dist_config_DATA) $(dist_gwinfo_DATA) $(dist_html_DATA) \
+ $(dist_maninst_DATA) $(dist_orghtml_DATA) \
$(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
$(nodist_context_DATA) $(nodist_property_DATA)
ETAGS = etags
@@ -216,6 +222,8 @@
CXXLINK_REQUIRED_FALSE = @CXXLINK_REQUIRED_FALSE@
CXXLINK_REQUIRED_TRUE = @CXXLINK_REQUIRED_TRUE@
CYGPATH_W = @CYGPATH_W@
+DEBUG_FALSE = @DEBUG_FALSE@
+DEBUG_TRUE = @DEBUG_TRUE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO = @ECHO@
@@ -333,6 +341,8 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+manualdir = $(datadir)@manualdir@
+manualsubdir = @manualsubdir@
mkdir_p = @mkdir_p@
nspr_inc = @nspr_inc@
nspr_lib = @nspr_lib@
@@ -362,6 +372,9 @@
# look for included m4 files in the ./m4/ directory
ACLOCAL_AMFLAGS = -I m4
+gwinfodir = $(manualdir)/en/$(manualsubdir)/info
+# this is the directory where the manuals will actually be installed
+maninstdir = $(manualdir)/en/$(manualsubdir)
DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)"
AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" $(DEBUG_DEFINES) \
@adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ \
@@ -371,11 +384,13 @@
-DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \
-DCGIBINDIR=\"$(cgibindir)\" -DCONTEXTDIR=\"$(contextdir)\" \
-DINSTCONFIGDIR=\"$(instconfigdir)\" \
- -DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\"
+ -DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\" \
+ -DMANUALSUBDIR=\"$(manualsubdir)\" -DINFODIR=\"$(gwinfodir)\"
# these are programs which we do not want to link with nss
NEED_SECGLUE = unauth search csearch newentry tutor lang
-cgibin_SCRIPTS = orgbin/org orgbin/myorg
+cgibin_SCRIPTS = orgbin/org orgbin/myorg $(am__append_3)
+ at DEBUG_TRUE@DBGSCRIPTS = $(addsuffix .sh,$(cgibin_PROGRAMS))
# I need propmaker to build with no libraries - I don't know of any other way to set
# the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the
# last thing on the link line before LIBS, so just have it terminate the command
@@ -476,6 +491,12 @@
pbconfig/display-room.html \
pbconfig/dsgwfilter.conf pbconfig/pb.tmpl
+dist_maninst_DATA = \
+ html/manual/a.gif html/manual/add.htm html/manual/attribua.gif html/manual/attribut.htm html/manual/auth.htm \
+ html/manual/contents.html html/manual/intro.htm html/manual/mod.htm html/manual/n.gif \
+ html/manual/objclass.htm html/manual/search.htm html/manual/t.gif html/manual/y.gif html/manual/index.map
+
+dist_gwinfo_DATA = html/info/infonav.html
nodist_context_DATA = dsgw-httpd.conf
#nodist_context_SCRIPTS = setup-dirsrv-gw
@@ -525,7 +546,8 @@
-e 's, at instconfigdir\@,$(instconfigdir),g' \
-e 's, at perlpath\@,$(perldir),g' \
-e 's, at perlexec\@, at perlexec@,g' \
- -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
+ -e 's, at manualdir\@,$(manualdir),g' \
+ -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
@@ -771,6 +793,23 @@
echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
rm -f "$(DESTDIR)$(configdir)/$$f"; \
done
+install-dist_gwinfoDATA: $(dist_gwinfo_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(gwinfodir)" || $(mkdir_p) "$(DESTDIR)$(gwinfodir)"
+ @list='$(dist_gwinfo_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_gwinfoDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gwinfodir)/$$f'"; \
+ $(dist_gwinfoDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gwinfodir)/$$f"; \
+ done
+
+uninstall-dist_gwinfoDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_gwinfo_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(gwinfodir)/$$f'"; \
+ rm -f "$(DESTDIR)$(gwinfodir)/$$f"; \
+ done
install-dist_htmlDATA: $(dist_html_DATA)
@$(NORMAL_INSTALL)
test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
@@ -788,6 +827,23 @@
echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \
rm -f "$(DESTDIR)$(htmldir)/$$f"; \
done
+install-dist_maninstDATA: $(dist_maninst_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(maninstdir)" || $(mkdir_p) "$(DESTDIR)$(maninstdir)"
+ @list='$(dist_maninst_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(dist_maninstDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(maninstdir)/$$f'"; \
+ $(dist_maninstDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(maninstdir)/$$f"; \
+ done
+
+uninstall-dist_maninstDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_maninst_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(maninstdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(maninstdir)/$$f"; \
+ done
install-dist_orghtmlDATA: $(dist_orghtml_DATA)
@$(NORMAL_INSTALL)
test -z "$(orghtmldir)" || $(mkdir_p) "$(DESTDIR)$(orghtmldir)"
@@ -925,7 +981,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/config $(distdir)/config/en $(distdir)/html $(distdir)/m4 $(distdir)/orghtml $(distdir)/pbconfig $(distdir)/pbhtml
+ $(mkdir_p) $(distdir)/config $(distdir)/config/en $(distdir)/html $(distdir)/html/info $(distdir)/html/manual $(distdir)/m4 $(distdir)/orghtml $(distdir)/pbconfig $(distdir)/pbhtml
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -1053,7 +1109,7 @@
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \
+ for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(gwinfodir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(maninstdir)" "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -1104,7 +1160,8 @@
info-am:
install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
- install-dist_configDATA install-dist_htmlDATA \
+ install-dist_configDATA install-dist_gwinfoDATA \
+ install-dist_htmlDATA install-dist_maninstDATA \
install-dist_orghtmlDATA install-dist_pbconfigDATA \
install-dist_pbhtmlDATA install-nodist_contextDATA \
install-nodist_propertyDATA
@@ -1138,7 +1195,8 @@
ps-am:
uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
- uninstall-dist_configDATA uninstall-dist_htmlDATA \
+ uninstall-dist_configDATA uninstall-dist_gwinfoDATA \
+ uninstall-dist_htmlDATA uninstall-dist_maninstDATA \
uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \
uninstall-dist_pbhtmlDATA uninstall-info-am \
uninstall-nodist_contextDATA uninstall-nodist_propertyDATA
@@ -1152,7 +1210,8 @@
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-cgibinPROGRAMS \
install-cgibinSCRIPTS install-data install-data-am \
- install-dist_configDATA install-dist_htmlDATA \
+ install-dist_configDATA install-dist_gwinfoDATA \
+ install-dist_htmlDATA install-dist_maninstDATA \
install-dist_orghtmlDATA install-dist_pbconfigDATA \
install-dist_pbhtmlDATA install-exec install-exec-am \
install-info install-info-am install-man \
@@ -1162,7 +1221,8 @@
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \
- uninstall-dist_configDATA uninstall-dist_htmlDATA \
+ uninstall-dist_configDATA uninstall-dist_gwinfoDATA \
+ uninstall-dist_htmlDATA uninstall-dist_maninstDATA \
uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \
uninstall-dist_pbhtmlDATA uninstall-info-am \
uninstall-nodist_contextDATA uninstall-nodist_propertyDATA
@@ -1190,6 +1250,10 @@
en.res en_US.res : root.res
cp -p $< $@
+ at DEBUG_TRUE@$(DBGSCRIPTS) : cgidbgwrapper.sh.in
+ at DEBUG_TRUE@ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ at DEBUG_TRUE@ $(fixupcmd) $< > $@
+
% : %.in
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
$(fixupcmd) $< > $@
More information about the Fedora-directory-commits
mailing list