diff -up ooRexx-4.1.0/Makefile.in.paths ooRexx-4.1.0/Makefile.in --- ooRexx-4.1.0/Makefile.in.paths 2010-12-03 18:16:39.000000000 +0100 +++ ooRexx-4.1.0/Makefile.in 2011-02-05 19:26:18.648226752 +0100 @@ -58,7 +58,7 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ +pkglibdir = $(libdir) pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 @@ -716,7 +716,7 @@ build_extensions_rexutils_platform_dir = build_api_platform_dir = $(api_@ORX_PLATFORM@_dir) build_os_platform_dir = $(platform_@ORX_PLATFORM@_dir) build_samples_platform_dir = $(samples_@ORX_PLATFORM@_dir) -catdir = $(prefix)/bin +catdir = $(datadir)/ooRexx 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)\" \ @@ -4365,20 +4365,20 @@ install-exec-local: echo $(DESTDIR) is destdir echo $(prefix) is prefix echo $(install_sh_PROGRAM) - $(install_sh_SCRIPT) rexx.img $(DESTDIR)$(prefix)/bin/rexx.img + $(install_sh_SCRIPT) rexx.img $(DESTDIR)$(catdir)/rexx.img if test -z "$(GENCAT)"; then \ echo "No rexx.cat to install"; \ else \ $(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)$(catdir)/rxregexp.cls + $(install_sh_SCRIPT) $(build_extensions_rxftp_dir)/rxftp.cls $(DESTDIR)$(catdir)/rxftp.cls + $(install_sh_SCRIPT) $(build_extensions_csvstream_dir)/csvStream.cls $(DESTDIR)$(catdir)/csvStream.cls + $(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/socket.cls $(DESTDIR)$(catdir)/socket.cls + $(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/streamsocket.cls $(DESTDIR)$(catdir)/streamsocket.cls + $(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/mime.cls $(DESTDIR)$(catdir)/mime.cls + $(install_sh_SCRIPT) $(build_extensions_rxsock_dir)/smtp.cls $(DESTDIR)$(catdir)/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