[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[swarm-cvs] [7944] move some Swarm internal tools into share directory i
From: |
Scott Christley |
Subject: |
[swarm-cvs] [7944] move some Swarm internal tools into share directory instead of bin or etc |
Date: |
Thu, 15 Mar 2012 16:42:54 +0000 |
Revision: 7944
http://svn.sv.gnu.org/viewvc/?view=rev&root=swarm&revision=7944
Author: schristley
Date: 2012-03-15 16:42:53 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
move some Swarm internal tools into share directory instead of bin or etc
Modified Paths:
--------------
branches/Swarm-2_4/swarm/ChangeLog
branches/Swarm-2_4/swarm/Makefile.am
branches/Swarm-2_4/swarm/etc/ChangeLog
branches/Swarm-2_4/swarm/etc/Makefile.am
branches/Swarm-2_4/swarm/etc/Makefile.appl.in
branches/Swarm-2_4/swarm/etc/Makefile.lib.in
branches/Swarm-2_4/swarm/etc/swarmrc.in
branches/Swarm-2_4/swarm/src/defobj/ChangeLog
branches/Swarm-2_4/swarm/src/defobj/Makefile.am
branches/Swarm-2_4/swarm/tools/ChangeLog
branches/Swarm-2_4/swarm/tools/Makefile.am
branches/Swarm-2_4/swarm/tools/print-hdf5.in
Modified: branches/Swarm-2_4/swarm/ChangeLog
===================================================================
--- branches/Swarm-2_4/swarm/ChangeLog 2012-03-14 22:19:17 UTC (rev 7943)
+++ branches/Swarm-2_4/swarm/ChangeLog 2012-03-15 16:42:53 UTC (rev 7944)
@@ -1,3 +1,8 @@
+2012-03-15 Scott Christley <address@hidden>
+
+ * Makefile.am: Install libtool-swarm in Swarm
+ share directory instead of system bin.
+
2011-03-04 Scott Christley <address@hidden>
* VERSION: Bump. 2.4.1 bug fix release.
Modified: branches/Swarm-2_4/swarm/Makefile.am
===================================================================
--- branches/Swarm-2_4/swarm/Makefile.am 2012-03-14 22:19:17 UTC (rev
7943)
+++ branches/Swarm-2_4/swarm/Makefile.am 2012-03-15 16:42:53 UTC (rev
7944)
@@ -15,7 +15,7 @@
$(INSTALL_DATA) swarmconfig.h $(DESTDIR)$(includedir)
$(INSTALL_DATA) externvar.h $(DESTDIR)$(includedir)
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/swarm
- $(INSTALL_PROGRAM) $(top_builddir)/libtool
$(DESTDIR)$(bindir)/libtool-swarm
+ $(INSTALL_PROGRAM) $(top_builddir)/libtool
$(DESTDIR)$(datarootdir)/swarm/libtool-swarm
if test $(SWARM_INSTALL) = install-sh; then $(INSTALL_PROGRAM)
$(srcdir)/install-sh $(DESTDIR)$(bindir); fi
install-recursive: install-data-local
Modified: branches/Swarm-2_4/swarm/etc/ChangeLog
===================================================================
--- branches/Swarm-2_4/swarm/etc/ChangeLog 2012-03-14 22:19:17 UTC (rev
7943)
+++ branches/Swarm-2_4/swarm/etc/ChangeLog 2012-03-15 16:42:53 UTC (rev
7944)
@@ -1,3 +1,12 @@
+2012-03-15 Scott Christley <address@hidden>
+
+ * swarmrc.in: Remove hash bang as script is meant to be
+ sourced not executed.
+ * Makefile.lib.in: Move make tools into Swarm share
+ directory instead of non-standard etc directory.
+ * Makefile.appl.in: Likewise.
+ * Makefile.am: Likewise.
+
2007-06-06 Bill Northcott <address@hidden>
* config.swarm.in Makefile.common.in: TEA updates
Modified: branches/Swarm-2_4/swarm/etc/Makefile.am
===================================================================
--- branches/Swarm-2_4/swarm/etc/Makefile.am 2012-03-14 22:19:17 UTC (rev
7943)
+++ branches/Swarm-2_4/swarm/etc/Makefile.am 2012-03-15 16:42:53 UTC (rev
7944)
@@ -1,12 +1,12 @@
EXTRA_DIST = config.swarm.in Makefile.common.in Makefile.appl.in
Makefile.lib.in Makefile.rules Makefile.tests.in common.el protocol.el
interface.el Makefile.protocol modules swarmrc.in swarmtrc.in swarm.make
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/swarm
- $(INSTALL_DATA) config.swarm $(DESTDIR)$(sysconfdir)/swarm
- $(INSTALL_DATA) Makefile.appl $(DESTDIR)$(sysconfdir)/swarm
- $(INSTALL_DATA) Makefile.lib $(DESTDIR)$(sysconfdir)/swarm
- $(INSTALL_DATA) Makefile.common $(DESTDIR)$(sysconfdir)/swarm
- $(INSTALL_DATA) $(srcdir)/Makefile.rules $(DESTDIR)$(sysconfdir)/swarm
- $(INSTALL_DATA) $(srcdir)/swarm.make $(DESTDIR)$(sysconfdir)/swarm
- $(INSTALL_DATA) swarmrc $(DESTDIR)$(sysconfdir)/swarm
- $(INSTALL_DATA) swarmtrc $(DESTDIR)$(sysconfdir)/swarm
+ $(mkinstalldirs) $(DESTDIR)$(datarootdir)/swarm
+ $(INSTALL_DATA) config.swarm $(DESTDIR)$(datarootdir)/swarm
+ $(INSTALL_DATA) Makefile.appl $(DESTDIR)$(datarootdir)/swarm
+ $(INSTALL_DATA) Makefile.lib $(DESTDIR)$(datarootdir)/swarm
+ $(INSTALL_DATA) Makefile.common $(DESTDIR)$(datarootdir)/swarm
+ $(INSTALL_DATA) $(srcdir)/Makefile.rules $(DESTDIR)$(datarootdir)/swarm
+ $(INSTALL_DATA) $(srcdir)/swarm.make $(DESTDIR)$(datarootdir)/swarm
+ $(INSTALL_DATA) swarmrc $(DESTDIR)$(datarootdir)/swarm
+ $(INSTALL_DATA) swarmtrc $(DESTDIR)$(datarootdir)/swarm
Modified: branches/Swarm-2_4/swarm/etc/Makefile.appl.in
===================================================================
--- branches/Swarm-2_4/swarm/etc/Makefile.appl.in 2012-03-14 22:19:17 UTC
(rev 7943)
+++ branches/Swarm-2_4/swarm/etc/Makefile.appl.in 2012-03-15 16:42:53 UTC
(rev 7944)
@@ -1,5 +1,6 @@
-include @swarm_prefix@/etc/swarm/Makefile.common
-include @swarm_prefix@/etc/swarm/Makefile.rules
+swarm_datarootdir = @prefix@/share/swarm
+include $(swarm_datarootdir)/Makefile.common
+include $(swarm_datarootdir)/Makefile.rules
APPEXE = $(APPLICATION)@EXEEXT@
LDFLAGS = $(SWARMLDFLAGS) $(EXTRALDFLAGS)
@@ -21,7 +22,7 @@
-rm -f $(OBJECTS) $(APPEXE) .libs/$(APPEXE) .libs/lt-$(APPEXE)
$(OTHERCLEAN) core gmon.out $(APPEXE).core
install: $(APPEXE) install-config install-data
- $(SHELL) $(bindir)/libtool-swarm --mode install $(INSTALL_PROGRAM)
$(APPEXE) $(bindir)
+ $(SHELL) $(swarm_datarootdir)/libtool-swarm --mode install
$(INSTALL_PROGRAM) $(APPEXE) $(bindir)
install-config:
if test -n "$(CONFIGFILES)" ; then \
@@ -38,7 +39,7 @@
fi
$(APPEXE): $(OBJECTS)
- $(SHELL) $(bindir)/libtool-swarm --mode link $(CC) $(CFLAGS) $(LDFLAGS)
$(GNUSTEPLIBLDFLAGS) -o $@ $(OBJECTS) $(APPLIBS) $(SWARMLIBS) $(OBJCLIBS)
$(EXTRALIBS) $(GNUSTEPLIBLIBS)
+ $(SHELL) $(swarm_datarootdir)/libtool-swarm --mode link $(CC) $(CFLAGS)
$(LDFLAGS) $(GNUSTEPLIBLDFLAGS) -o $@ $(OBJECTS) $(APPLIBS) $(SWARMLIBS)
$(OBJCLIBS) $(EXTRALIBS) $(GNUSTEPLIBLIBS)
# Local variables:
# mode: makefile
Modified: branches/Swarm-2_4/swarm/etc/Makefile.lib.in
===================================================================
--- branches/Swarm-2_4/swarm/etc/Makefile.lib.in 2012-03-14 22:19:17 UTC
(rev 7943)
+++ branches/Swarm-2_4/swarm/etc/Makefile.lib.in 2012-03-15 16:42:53 UTC
(rev 7944)
@@ -1,5 +1,5 @@
-include @swarm_prefix@/etc/swarm/Makefile.common
-include @swarm_prefix@/etc/swarm/Makefile.rules
+include @prefix@/share/swarm/Makefile.common
+include @prefix@/share/swarm/Makefile.rules
LIBRARY = lib$(LIBNAME).a
INCFILE = $(LIBNAME).h
Modified: branches/Swarm-2_4/swarm/etc/swarmrc.in
===================================================================
--- branches/Swarm-2_4/swarm/etc/swarmrc.in 2012-03-14 22:19:17 UTC (rev
7943)
+++ branches/Swarm-2_4/swarm/etc/swarmrc.in 2012-03-15 16:42:53 UTC (rev
7944)
@@ -1,5 +1,3 @@
-#!/bin/sh
-
########################################################################
# Swarm library. Copyright \xA9 2004 Swarm Development Group. #
# This program is free software; you can redistribute it and/or modify #
Modified: branches/Swarm-2_4/swarm/src/defobj/ChangeLog
===================================================================
--- branches/Swarm-2_4/swarm/src/defobj/ChangeLog 2012-03-14 22:19:17 UTC
(rev 7943)
+++ branches/Swarm-2_4/swarm/src/defobj/ChangeLog 2012-03-15 16:42:53 UTC
(rev 7944)
@@ -1,3 +1,8 @@
+2012-03-15 Scott Christley <address@hidden>
+
+ * Makefile.am: Install m2h and make-h2x into Swarm
+ share directory instead of system bin.
+
2009-03-05 Scott Christley <address@hidden>
* FCall.m: mframe internals not available for GNUstep.
Modified: branches/Swarm-2_4/swarm/src/defobj/Makefile.am
===================================================================
--- branches/Swarm-2_4/swarm/src/defobj/Makefile.am 2012-03-14 22:19:17 UTC
(rev 7943)
+++ branches/Swarm-2_4/swarm/src/defobj/Makefile.am 2012-03-15 16:42:53 UTC
(rev 7944)
@@ -28,7 +28,7 @@
libdefobj_la_LDFLAGS = @inst_LDFLAGS@
libdefobj_la_LIBADD = $(FFILIB)
-bin_SCRIPTS = m2h make-h2x
+#bin_SCRIPTS = m2h make-h2x
defobj_HEADERS = Archiver.h LispArchiver.h HDF5Archiver.h Arguments.h Create.h
Customize.h DefClass.h DefObject.h HDF5Object.h Program.h Symbol.h Zone.h
FCall.h FArguments.h defalloc.h deftype.h directory.h JavaProxy.h
JavaClassProxy.h JavaCollection.h JavaCollectionIndex.h javavars.h COMProxy.h
macros.h COM.h
@@ -44,6 +44,8 @@
$(INSTALL_DATA) classes.h $(DESTDIR)$(defobjdir)
$(INSTALL_DATA) types.h $(DESTDIR)$(defobjdir)
$(INSTALL_DATA) version.h $(DESTDIR)$(defobjdir)
+ $(INSTALL_PROGRAM) m2h $(DESTDIR)$(datarootdir)/swarm/m2h
+ $(INSTALL_PROGRAM) make-h2x $(DESTDIR)$(datarootdir)/swarm/make-h2x
include $(top_srcdir)/etc/Makefile.protocol
Modified: branches/Swarm-2_4/swarm/tools/ChangeLog
===================================================================
--- branches/Swarm-2_4/swarm/tools/ChangeLog 2012-03-14 22:19:17 UTC (rev
7943)
+++ branches/Swarm-2_4/swarm/tools/ChangeLog 2012-03-15 16:42:53 UTC (rev
7944)
@@ -1,3 +1,9 @@
+2012-03-15 Scott Christley <address@hidden>
+
+ * Makefile.am: Install print-hdf5 into Swarm share
+ directory instead of in system bin.
+ * print-hdf5.in: Move hash bang to first line.
+
2008-04-26 Marcus G. Daniels <address@hidden>
* as: Don't recode sections individually (e.g. __cstring_object).
Modified: branches/Swarm-2_4/swarm/tools/Makefile.am
===================================================================
--- branches/Swarm-2_4/swarm/tools/Makefile.am 2012-03-14 22:19:17 UTC (rev
7943)
+++ branches/Swarm-2_4/swarm/tools/Makefile.am 2012-03-15 16:42:53 UTC (rev
7944)
@@ -1,4 +1,4 @@
-bin_SCRIPTS = print-hdf5
+#bin_SCRIPTS = print-hdf5
SCHEME = print-table.scm swarm.scm
EXTRA_DIST = as print-hdf5.in $(SCHEME)
@@ -19,3 +19,6 @@
address@hidden@
findImp_LDFLAGS = -L$(top_builddir)/src $(LIBOBJCLDFLAGS) $(GNUSTEPLIBLDFLAGS)
findImp_LDADD = @SWARMLIBS@ $(GNUSTEPLIBLIBS)
+
+install-data-local:
+ $(INSTALL_PROGRAM) print-hdf5 $(DESTDIR)$(datarootdir)/swarm/print-hdf5
Modified: branches/Swarm-2_4/swarm/tools/print-hdf5.in
===================================================================
--- branches/Swarm-2_4/swarm/tools/print-hdf5.in 2012-03-14 22:19:17 UTC
(rev 7943)
+++ branches/Swarm-2_4/swarm/tools/print-hdf5.in 2012-03-15 16:42:53 UTC
(rev 7944)
@@ -1,3 +1,5 @@
+#!/bin/sh
+
# Copyright \xA9 2000 Swarm Development Group
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,7 +19,6 @@
# The Swarm Development Group can be reached via our website at:
# http://www.swarm.org/
-#!/bin/sh
if [ $# -lt 2 ] ; then
echo Usage: $0 file.hdf key 1>&2
exit 1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [swarm-cvs] [7944] move some Swarm internal tools into share directory instead of bin or etc,
Scott Christley <=