31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
submitted upstream as https://bugzilla.novell.com/show_bug.cgi?id=607582
|
|
==================================================================
|
|
Index: simias-trunk20100511/src/webaccess/Makefile.am
|
|
===================================================================
|
|
--- simias-trunk20100511.orig/src/webaccess/Makefile.am 2010-05-20 12:09:08.131394177 -0400
|
|
+++ simias-trunk20100511/src/webaccess/Makefile.am 2010-05-20 12:09:13.191394736 -0400
|
|
@@ -176,7 +176,7 @@
|
|
rm -rf `find $(DESTDIR)$(webaccessdir)/help -name .svn`
|
|
cd $(srcdir)/images; cp -r * $(DESTDIR)$(webaccessdir)/images
|
|
rm -rf `find $(DESTDIR)$(webaccessdir)/images -name .svn`
|
|
- $(INSTALL_PROGRAM) $(DESTDIR)$(webaccessdir)/../web/bin/SimiasLib.dll $(DESTDIR)$(webaccessdir)/bin
|
|
+ $(INSTALL_PROGRAM) $(DESTDIR)$(webbindir)/SimiasLib.dll $(DESTDIR)$(webaccessdir)/bin
|
|
#if !LINUX
|
|
# $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(webaccessdir)/bin
|
|
#endif
|
|
Index: simias-trunk20100511/src/admin/Makefile.am
|
|
===================================================================
|
|
--- simias-trunk20100511.orig/src/admin/Makefile.am 2010-05-20 12:09:08.121392780 -0400
|
|
+++ simias-trunk20100511/src/admin/Makefile.am 2010-05-20 12:09:13.191394736 -0400
|
|
@@ -201,8 +201,8 @@
|
|
rm -rf `find $(DESTDIR)$(admindir)/images -name .svn`
|
|
cd $(srcdir)/css; cp -r * $(DESTDIR)$(admindir)/css
|
|
rm -rf `find $(DESTDIR)$(admindir)/css -name .svn`
|
|
- $(INSTALL_PROGRAM) $(DESTDIR)$(admindir)/../web/bin/SimiasLib.dll $(DESTDIR)$(admindir)/bin/
|
|
- $(INSTALL_PROGRAM) $(DESTDIR)$(admindir)/../web/bin/SimiasClient.dll $(DESTDIR)$(admindir)/bin/
|
|
+ $(INSTALL_PROGRAM) $(DESTDIR)$(webbindir)/SimiasLib.dll $(DESTDIR)$(admindir)/bin/
|
|
+ $(INSTALL_PROGRAM) $(DESTDIR)$(webbindir)/SimiasClient.dll $(DESTDIR)$(admindir)/bin/
|
|
#if !LINUX
|
|
# $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(admindir)/bin
|
|
#endif
|