106 lines
4.6 KiB
Diff
106 lines
4.6 KiB
Diff
Index: configure.in
|
|
===================================================================
|
|
--- configure.in (Revision 7049)
|
|
+++ configure.in (Arbeitskopie)
|
|
@@ -438,7 +438,8 @@
|
|
# Setup the bootstrapdir
|
|
#
|
|
|
|
-etcdir="/etc"
|
|
+#etcdir="/etc"
|
|
+etcdir="${sysconfdir}"
|
|
AC_SUBST(etcdir)
|
|
|
|
case $SIMIAS_OS in
|
|
Index: src/webaccess/Makefile.am
|
|
===================================================================
|
|
--- src/webaccess/Makefile.am (Revision 7049)
|
|
+++ src/webaccess/Makefile.am (Arbeitskopie)
|
|
@@ -121,7 +121,7 @@
|
|
all: Novell.iFolderWeb.dll
|
|
|
|
iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
|
|
- wsdl /nologo /out:$@ $<
|
|
+ $(WSDL) /nologo /out:$@ $<
|
|
|
|
Novell.iFolderWeb.dll: $(srcdir)/AssemblyInfo.cs $(iFolderWeb_CSFILES) $(iFolderWeb_RESOURCES)
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWeb_FLAGS) $(iFolderWeb_LIBS:%=/r:%) $(iFolderWeb_RESOURCES:%=/res:%) $(iFolderWeb_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWeb_CSFILES_CSC) /doc:iFolderWeb.doc.xml
|
|
Index: src/utils/usercmd/Makefile.am
|
|
===================================================================
|
|
--- src/utils/usercmd/Makefile.am (Revision 7049)
|
|
+++ src/utils/usercmd/Makefile.am (Arbeitskopie)
|
|
@@ -34,7 +34,7 @@
|
|
all: UserCmd.exe
|
|
|
|
AdminService.cs: ../../webservices/iFolderAdmin.wsdl
|
|
- wsdl /nologo /out:$@ $<
|
|
+ $(WSDL) /nologo /out:$@ $<
|
|
|
|
UserCmd.exe: $(srcdir)/AssemblyInfo.cs $(UserCmd_CSFILES) $(UserCmd_RESOURCES)
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(UserCmd_FLAGS) $(SIMIAS_LIBS) $(UserCmd_LIBS:%=/r:%) $(UserCmd_LIBPATH:%=/lib:%) $(UserCmd_RESOURCES:%=$(ICON_FLAG)%) $(UserCmd_CSFILES_CSC) $(DOC_FILE_CMD)
|
|
Index: src/webservices/Makefile.am
|
|
===================================================================
|
|
--- src/webservices/Makefile.am (Revision 7049)
|
|
+++ src/webservices/Makefile.am (Arbeitskopie)
|
|
@@ -101,10 +101,10 @@
|
|
cp ../server/Simias.LdapProvider/Simias.LdapProvider.dll .
|
|
|
|
iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
|
|
- wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
|
|
+ $(WSDL) /nologo /namespace:iFolder.WebService.Web /out:$@ $<
|
|
|
|
iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
|
|
- wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
|
|
+ $(WSDL) /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
|
|
|
|
iFolderWebLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
|
|
$(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderWebLocal http://127.0.0.1:8086/simias10/iFolderWebLocal.asmx $@
|
|
Index: src/admin/Makefile.am
|
|
===================================================================
|
|
--- src/admin/Makefile.am (Revision 7049)
|
|
+++ src/admin/Makefile.am (Arbeitskopie)
|
|
@@ -141,7 +141,7 @@
|
|
all: Novell.iFolderAdmin.dll
|
|
|
|
iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
|
|
- wsdl /nologo /out:$@ $<
|
|
+ $(WSDL) /nologo /out:$@ $<
|
|
|
|
Novell.iFolderAdmin.dll: $(srcdir)/AssemblyInfo.cs iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(srcdir)/AssemblyInfo.cs $(iFolderAdmin_CSFILES_CSC) $(LOG4NET_LIBS)
|
|
Index: src/core/SimiasClient/Makefile.am
|
|
===================================================================
|
|
--- src/core/SimiasClient/Makefile.am (Revision 7049)
|
|
+++ src/core/SimiasClient/Makefile.am (Arbeitskopie)
|
|
@@ -38,7 +38,7 @@
|
|
wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
endif
|
|
if LINUX
|
|
- -$(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
+ $(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
endif
|
|
if DARWIN
|
|
wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
@@ -46,7 +46,7 @@
|
|
|
|
$(srcdir)/SimiasService2.cs: $(srcdir)/../WebService/Simias.wsdl
|
|
if LINUX
|
|
- wsdl -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl
|
|
+ $(WSDL) -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl
|
|
$(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
endif
|
|
|
|
Index: src/reports/Proxy/Makefile.am
|
|
===================================================================
|
|
--- src/reports/Proxy/Makefile.am (Revision 7049)
|
|
+++ src/reports/Proxy/Makefile.am (Arbeitskopie)
|
|
@@ -28,7 +28,7 @@
|
|
all: Novell.iFolder.Enterprise.Reports.Proxy.dll
|
|
|
|
iFolderReportsProxy.cs: ../WebService/iFolderReports.wsdl
|
|
- wsdl /nologo /out:$@ $<
|
|
+ $(WSDL) /nologo /out:$@ $<
|
|
|
|
Novell.iFolder.Enterprise.Reports.Proxy.dll: iFolderReportsProxy.cs $(iFolderReportsProxy_CSFILES) $(iFolderReportsProxy_RESOURCES)
|
|
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderReportsProxy_FLAGS) $(iFolderReportsProxy_LIBS:%=/r:%) $(iFolderReportsProxy_LIBPATH:%=/lib:%) $(iFolderReportsProxy_CSFILES_CSC) /doc:iFolderReportsProxy.doc.xml
|