--- freem/Makefile.am	2025/03/10 00:42:41	1.4
+++ freem/Makefile.am	2025/04/01 14:32:10	1.8
@@ -1,5 +1,5 @@
 #
-#   $Id: Makefile.am,v 1.4 2025/03/10 00:42:41 snw Exp $
+#   $Id: Makefile.am,v 1.8 2025/04/01 14:32:10 snw Exp $
 #    automake rules for freem
 #
 #  
@@ -24,6 +24,18 @@
 #   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
 #
 #   $Log: Makefile.am,v $
+#   Revision 1.8  2025/04/01 14:32:10  snw
+#   Begin work on environment and namespace reorg
+#
+#   Revision 1.7  2025/03/27 03:47:46  snw
+#   Fix dist problems
+#
+#   Revision 1.6  2025/03/27 03:27:34  snw
+#   Install init scripts to share/freem/examples/init and fix regression in method dispatch
+#
+#   Revision 1.5  2025/03/24 04:21:39  snw
+#   Attempted installer fix for OS/2
+#
 #   Revision 1.4  2025/03/10 00:42:41  snw
 #   Fix broken build regression
 #
@@ -41,11 +53,11 @@ dist_doc_DATA = README.md doc/freem.1
 man1_MANS = doc/freem.1
 info_TEXINFOS = doc/freem.texi
 
-systemgbldir = $(localstatedir)/freem/DEFAULT/SYSTEM/globals
-systemrtndir = $(localstatedir)/freem/DEFAULT/SYSTEM/routines
-usergbldir = $(localstatedir)/freem/DEFAULT/USER/globals
-userrtndir = $(localstatedir)/freem/DEFAULT/USER/routines
-journaldir = $(localstatedir)/freem/DEFAULT/journals
+systemrtndir = $(datadir)/freem/mlib
+systemddir = $(datadir)/freem/examples/init/systemd
+systemdfedoradir = $(datadir)/freem/examples/init/systemd/fedora
+freebsdrcdir = $(datadir)/freem/examples/init/freebsd_rc
+solarisinitdir = $(datadir)/freem/examples/init/solaris
 
 mlib = mlib/%DB.m mlib/%MAPPING.m mlib/%NETHTTP.m \
        mlib/%SYSINIT.m mlib/%TUIMENU.m mlib/%ZCOLUMNS.m \
@@ -54,20 +66,19 @@ mlib = mlib/%DB.m mlib/%MAPPING.m mlib/%
        mlib/%SYSPOLY.m mlib/%ulstring.m mlib/%ulmath.m mlib/%ulcharacter.m \
        mlib/%SYSOOP.m mlib/%STRING.m mlib/%OBJECT.m mlib/%ED.m
 
-EXTRA_DIST = sem.ver sysns_routine.txt sysns_global.txt userns_routine.txt userns_global.txt journals.txt $(mlib)
+EXTRA_DIST = sem.ver $(mlib) \
+             scripts/systemd/system/freem.service scripts/systemd/fedora/freem.service scripts/freebsd-rc/freem scripts/solaris-init/freem
 
 systemrtn_DATA = $(mlib) sysns_routine.txt
-systemgbl_DATA = sysns_global.txt
-userrtn_DATA = userns_routine.txt
-usergbl_DATA = userns_global.txt
-journal_DATA = journals.txt
+systemd_DATA = scripts/systemd/system/freem.service
+systemdfedora_DATA = scripts/systemd/fedora/freem.service
+freebsdrc_DATA = scripts/freebsd-rc/freem
+solarisinit_DATA = scripts/solaris-init/freem
 
 install-exec-hook:
-	chmod 755 $(DESTDIR)$(bindir)/freem
+	chmod 755 $(DESTDIR)$(bindir)/freem*
 
 install-data-hook:
-	chmod -R 777 $(DESTDIR)$(journaldir) $(DESTDIR)$(systemgbldir) $(DESTDIR)$(usergbldir) $(DESTDIR)$(userrtndir)
-	chmod -R 755 $(DESTDIR)$(systemrtndir)
 	@echo
 	@echo "============================================================================================"
 	@echo