File set_default_rexx_path.patch of Package ooRexx

Overview Repositories Revisions Requests Users Attributes Meta

File set_default_rexx_path.patch of Package ooRexx (Revision 76df3190383e18f608cb71cb372cdc76)

Currently displaying revision 76df3190383e18f608cb71cb372cdc76 , Show latest

diff -Naur ooRexx-4.1.1/interpreter/platform/unix/SysInterpreterInstance.cpp ooRexx-4.1.1/interpreter/platform/unix/SysInterpreterInstance.cpp
--- ooRexx-4.1.1/interpreter/platform/unix/SysInterpreterInstance.cpp	2012-07-18 01:30:52.000000000 -0300
+++ ooRexx-4.1.1/interpreter/platform/unix/SysInterpreterInstance.cpp	2012-10-23 14:23:49.638038539 -0200
@@ -102,6 +102,13 @@
     size_t parentSize = parentDir == NULL ? 0 : strlen(parentDir);
     size_t extensionSize = extensionPath == NULL ? 0 : strlen(extensionPath);
 
+#ifdef PKGDATADIR
+	if(!rexxPath)
+	{
+		rexxPath=PKGDATADIR;
+		rexxPathSize = strlen(rexxPath);
+	}
+#endif // PKGDATADIR
 
     // enough room for separators and a terminating null
     path = (char *)SystemInterpreter::allocateResultMemory(sysPathSize + rexxPathSize + parentSize + extensionSize + 16);
 
--- ooRexx-4.1.2/Makefile.am	2012-11-12 11:33:27.064531823 -0200
+++ ooRexx-4.1.2/Makefile.am	2012-11-12 11:36:21.679707043 -0200
@@ -155,7 +155,8 @@
 COMMON_CPPFLAGS = -DORX_VER=$(ORX_MAJOR) -DORX_REL=$(ORX_MINOR) -DORX_MOD=$(ORX_MOD_LVL) -DORX_FIX=0 \
                   -DORX_SYS_STR=\"@ORX_SYS_STR@\" \
                   -DORX_CATDIR=\"$(catdir)\" \
-                  -DORX_SHARED_LIBRARY_EXT=\"@ORX_SHARED_LIBRARY_EXT@\"
+                  -DORX_SHARED_LIBRARY_EXT=\"@ORX_SHARED_LIBRARY_EXT@\" \
+                  -DPKGDATADIR=\"$(pkgdatadir)\"
 
 messageXML = $(build_messages_dir)/rexxmsg.xml
 
@@ -1062,13 +1063,13 @@
 		$(install_sh_SCRIPT) rexx.cat $(DESTDIR)$(catdir)/rexx.cat; \
 	fi
 	$(install_sh_SCRIPT) $(build_os_platform_dir)/oorexx-config $(DESTDIR)$(prefix)/bin/oorexx-config
-	$(install_sh_SCRIPT) $(build_extensions_rxregexp_dir)/rxregexp.cls $(DESTDIR)$(prefix)/bin/rxregexp.cls
-	$(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(prefix)/bin/rxftp.cls
-	$(install_sh_SCRIPT) $(build_extensions_csvstream_dir)/csvStream.cls $(DESTDIR)$(prefix)/bin/csvStream.cls
-	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(prefix)/bin/socket.cls
-	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/streamsocket.cls $(DESTDIR)$(prefix)/bin/streamsocket.cls
-	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/mime.cls $(DESTDIR)$(prefix)/bin/mime.cls
-	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/smtp.cls $(DESTDIR)$(prefix)/bin/smtp.cls
+	$(install_sh_SCRIPT) $(build_extensions_rxregexp_dir)/rxregexp.cls $(DESTDIR)$(pkgdatadir)/rxregexp.cls
+	$(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(pkgdatadir)/rxftp.cls
+	$(install_sh_SCRIPT) $(build_extensions_csvstream_dir)/csvStream.cls $(DESTDIR)$(pkgdatadir)/csvStream.cls
+	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(pkgdatadir)/socket.cls
+	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/streamsocket.cls $(DESTDIR)$(pkgdatadir)/streamsocket.cls
+	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/mime.cls $(DESTDIR)$(pkgdatadir)/mime.cls
+	$(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/smtp.cls $(DESTDIR)$(pkgdatadir)/smtp.cls
 	if test "$(ORX_SYS_STR)" != "AIX" -a "$(ORX_SYS_STR)" != "MACOSX"; then \
 		$(install_sh_SCRIPT) $(rexxapi_server_unix_dir)/rxapid $(DESTDIR)$(prefix)/bin/rxapid; \
 	fi

Places

File set_default_rexx_path.patch of Package ooRexx (Revision 76df3190383e18f608cb71cb372cdc76)

Places