Hi,
i tried to port abiword-0.1.3 to Solaris.
Furthermore i had to change to gtk-1.1.2,
as you will also have to. The diffs are attached.
They should not affect compiling on Linux assumed
you are using GNU-make. Furthermore the attached
script install-sh is required. It must go to
src/util/unix.
Though compiling works and the program starts,
i see only the Menubar and nothing in the
main window. Anyway if my diffs do not affect
behaviour under Linux, applying them might
nonetheless be worth considering and a starting
point for Solaris and gtk-1.1.2.
Regards,
Albert
P.S.: supporting Linux AND Windows changes 100 %
absolutely super-surely NOTHING.
-- Albert Flügel, tdsc Tel.: +49-89-636-27690 bei: Siemens AG Fax.: +49-89-636-28983 Balanstr. 73 D1: +49-171-3698673 81541 München mailto: tdscaf@hl.siemens.de --------------9D3DFCA297E14D7DD79C026D Content-Type: text/plain; charset=us-ascii; name="abi.diffs" Content-Disposition: inline; filename="abi.diffs" Content-Transfer-Encoding: 7bitdiff -u -r abi-0.1.3/src/config/abi_defs.mk abi-0.1.3.patch/src/config/abi_defs.mk --- abi-0.1.3/src/config/abi_defs.mk Wed Oct 14 00:10:51 1998 +++ abi-0.1.3.patch/src/config/abi_defs.mk Fri Oct 16 14:37:56 1998 @@ -122,6 +122,42 @@ # end of Linux section ####################### +ifeq ($(OS_NAME), SunOS) + +OBJ_SUFFIX = o +LIB_SUFFIX = a +DLL_SUFFIX = so +AR = ar cr $@ + +OPTIMIZER = -g +DEFINES = -DDEBUG -UNDEBUG +# note that we only build debug. TODO +DBG_OR_NOT = DBG + +CC = gcc +CCC = g++ +RANLIB = ranlib + +OS_INCLUDES = +G++INCLUDES = -I/usr/include/g++ + +INSTALL = $(ABI_DEPTH)/util/unix/install-sh -c + +PLATFORM_FLAGS = -ansi -Wall -pipe -DSunOS +PORT_FLAGS = -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR + +OS_CFLAGS = $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS) + +PLATFORM_FLAGS += +PORT_FLAGS += -D_XOPEN_SOURCE + +MKSHLIB = $(LD) $(DSO_LDOPTS) -soname $(@:$(OBJDIR)/%.so=%.so) +ABI_NATIVE= unix + +endif +# end of SunOS section +####################### + define MAKE_OBJDIR if test ! -d $(@D); then rm -rf $(@D); $(INSTALL) -d $(@D); fi endef diff -u -r abi-0.1.3/src/config/abi_rules.mk abi-0.1.3.patch/src/config/abi_rules.mk --- abi-0.1.3/src/config/abi_rules.mk Tue Oct 13 22:09:24 1998 +++ abi-0.1.3.patch/src/config/abi_rules.mk Fri Oct 16 16:16:53 1998 @@ -86,7 +86,7 @@ @for d in $(DIRS); do \ if test -d $$d; then \ set -e; \ - echo "cd $$d; $(MAKE) $@"; \ + echo "$(MAKE) -C $$d $@"; \ $(MAKE) -C $$d $@; \ set +e; \ else \ diff -u -r abi-0.1.3/src/other/expat/Makefile abi-0.1.3.patch/src/other/expat/Makefile --- abi-0.1.3/src/other/expat/Makefile Tue Aug 18 20:33:22 1998 +++ abi-0.1.3.patch/src/other/expat/Makefile Fri Oct 16 15:21:51 1998 @@ -46,4 +46,5 @@ install:: libs $(subst xxxx,$(DIST)/lib,$(VERIFY_DIRECTORY)) - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 444 $$t $(DIST)/lib ; done diff -u -r abi-0.1.3/src/other/expat/xmlparse/Makefile abi-0.1.3.patch/src/other/expat/xmlparse/Makefile --- abi-0.1.3/src/other/expat/xmlparse/Makefile Tue Aug 18 20:33:22 1998 +++ abi-0.1.3.patch/src/other/expat/xmlparse/Makefile Fri Oct 16 15:22:41 1998 @@ -43,7 +43,8 @@ export:: $(EXPORT_HEADERS) $(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - $(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) diff -u -r abi-0.1.3/src/other/expat/xmltok/Makefile abi-0.1.3.patch/src/other/expat/xmltok/Makefile --- abi-0.1.3/src/other/expat/xmltok/Makefile Tue Aug 18 20:33:22 1998 +++ abi-0.1.3.patch/src/other/expat/xmltok/Makefile Fri Oct 16 16:32:33 1998 @@ -55,7 +55,8 @@ export:: $(EXPORT_HEADERS) $(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - $(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) @@ -70,6 +71,6 @@ ../gennmtab/$(OBJDIR)/gennmtab$(EXE_SUFFIX) >$@ ../gennmtab/$(OBJDIR)/gennmtab$(EXE_SUFFIX): - cd ../gennmtab; $(MAKE) + $(MAKE) -C ../gennmtab .PRECIOUS: nametab.h diff -u -r abi-0.1.3/src/ps/xp/Makefile abi-0.1.3.patch/src/ps/xp/Makefile --- abi-0.1.3/src/ps/xp/Makefile Tue Aug 18 19:52:04 1998 +++ abi-0.1.3.patch/src/ps/xp/Makefile Fri Oct 16 15:19:23 1998 @@ -53,11 +53,13 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) @echo Exporting library $(LIBRARY_NAME) from `pwd`... @$(subst xxxx,$(DIST)/lib,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 444 $$t $(DIST)/lib ; done install:: libs diff -u -r abi-0.1.3/src/util/Makefile abi-0.1.3.patch/src/util/Makefile --- abi-0.1.3/src/util/Makefile Fri Oct 2 23:55:08 1998 +++ abi-0.1.3.patch/src/util/Makefile Fri Oct 16 15:23:28 1998 @@ -53,4 +53,6 @@ install:: libs @echo Exporting library $(LIBRARY_NAME) from `pwd`... @$(subst xxxx,$(DIST)/lib,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 444 $$t $(DIST)/lib ; done + diff -u -r abi-0.1.3/src/util/unix/Makefile abi-0.1.3.patch/src/util/unix/Makefile --- abi-0.1.3/src/util/unix/Makefile Tue Aug 18 19:52:05 1998 +++ abi-0.1.3.patch/src/util/unix/Makefile Fri Oct 16 15:24:44 1998 @@ -43,7 +43,8 @@ ifneq ($(strip $(EXPORT_HEADERS)),) export:: $(EXPORT_HEADERS) $(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - $(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done endif libs:: $(TARGETS) diff -u -r abi-0.1.3/src/util/win/Makefile abi-0.1.3.patch/src/util/win/Makefile --- abi-0.1.3/src/util/win/Makefile Tue Aug 18 19:52:05 1998 +++ abi-0.1.3.patch/src/util/win/Makefile Fri Oct 16 15:12:12 1998 @@ -44,7 +44,8 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done endif libs:: $(TARGETS) diff -u -r abi-0.1.3/src/util/xp/Makefile abi-0.1.3.patch/src/util/xp/Makefile --- abi-0.1.3/src/util/xp/Makefile Fri Oct 2 23:55:08 1998 +++ abi-0.1.3.patch/src/util/xp/Makefile Fri Oct 16 15:23:50 1998 @@ -62,8 +62,9 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... - @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + $(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) diff -u -r abi-0.1.3/src/wp/fmt/xp/Makefile abi-0.1.3.patch/src/wp/fmt/xp/Makefile --- abi-0.1.3/src/wp/fmt/xp/Makefile Fri Oct 2 23:55:08 1998 +++ abi-0.1.3.patch/src/wp/fmt/xp/Makefile Fri Oct 16 15:26:38 1998 @@ -73,11 +73,13 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) @echo Exporting library $(LIBRARY_NAME) from `pwd`... @$(subst xxxx,$(DIST)/lib,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 444 $$t $(DIST)/lib ; done install:: libs diff -u -r abi-0.1.3/src/wp/fmt/xp/fv_View.cpp abi-0.1.3.patch/src/wp/fmt/xp/fv_View.cpp --- abi-0.1.3/src/wp/fmt/xp/fv_View.cpp Sat Oct 10 06:52:42 1998 +++ abi-0.1.3.patch/src/wp/fmt/xp/fv_View.cpp Fri Oct 16 16:56:35 1998 @@ -40,7 +40,7 @@ #include "dg_Graphics.h" #include "dg_DrawArgs.h" #include "ie_types.h" - + FV_View::FV_View(FL_DocLayout* pLayout) { diff -u -r abi-0.1.3/src/wp/gui/unix/Makefile abi-0.1.3.patch/src/wp/gui/unix/Makefile --- abi-0.1.3/src/wp/gui/unix/Makefile Tue Oct 13 22:15:07 1998 +++ abi-0.1.3.patch/src/wp/gui/unix/Makefile Fri Oct 16 16:32:49 1998 @@ -91,15 +91,17 @@ ifneq ($(strip $(EXPORT_HEADERS)),) export:: $(EXPORT_HEADERS) $(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - $(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done endif install:: $(TARGETS) $(subst xxxx,$(DIST)/bin,$(VERIFY_DIRECTORY)) - $(INSTALL) -m 755 $(TARGETS) $(DIST)/bin + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 755 $$t $(DIST)/bin ; done ################################################################## -$(OTHER_OBJS):: - cd ../xp; $(MAKE) +#$(OTHER_OBJS):: +# cd ../xp; $(MAKE) diff -u -r abi-0.1.3/src/wp/gui/win/Makefile abi-0.1.3.patch/src/wp/gui/win/Makefile --- abi-0.1.3/src/wp/gui/win/Makefile Tue Oct 13 21:24:27 1998 +++ abi-0.1.3.patch/src/wp/gui/win/Makefile Fri Oct 16 15:15:50 1998 @@ -92,13 +92,15 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done endif install:: $(TARGETS) @echo Exporting $(TARGETS) from `pwd`... @$(subst xxxx,$(DIST)/bin,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 755 $(TARGETS) $(DIST)/bin + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 755 $$t $(DIST)/bin ; done ################################################################## diff -u -r abi-0.1.3/src/wp/gui/xp/Makefile abi-0.1.3.patch/src/wp/gui/xp/Makefile --- abi-0.1.3/src/wp/gui/xp/Makefile Fri Oct 9 21:12:05 1998 +++ abi-0.1.3.patch/src/wp/gui/xp/Makefile Fri Oct 16 15:16:12 1998 @@ -54,7 +54,8 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) diff -u -r abi-0.1.3/src/wp/guts/unix/Makefile abi-0.1.3.patch/src/wp/guts/unix/Makefile --- abi-0.1.3/src/wp/guts/unix/Makefile Tue Oct 13 22:15:07 1998 +++ abi-0.1.3.patch/src/wp/guts/unix/Makefile Fri Oct 16 16:22:48 1998 @@ -91,15 +91,17 @@ ifneq ($(strip $(EXPORT_HEADERS)),) export:: $(EXPORT_HEADERS) $(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - $(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done endif install:: $(TARGETS) $(subst xxxx,$(DIST)/bin,$(VERIFY_DIRECTORY)) - $(INSTALL) -m 755 $(TARGETS) $(DIST)/bin + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 755 $$t $(DIST)/bin ; done ################################################################## -$(OTHER_OBJS):: - cd ../xp; $(MAKE) +#$(OTHER_OBJS):: +# $(MAKE) -C ../xp diff -u -r abi-0.1.3/src/wp/guts/unix/dg_GTKMenu.cpp abi-0.1.3.patch/src/wp/guts/unix/dg_GTKMenu.cpp --- abi-0.1.3/src/wp/guts/unix/dg_GTKMenu.cpp Tue Aug 18 20:33:23 1998 +++ abi-0.1.3.patch/src/wp/guts/unix/dg_GTKMenu.cpp Fri Oct 16 17:39:12 1998 @@ -20,8 +20,8 @@ ** */ +#include <string.h> #include <gtk/gtk.h> -#include <strings.h> #include "dg_UnixMenu.h" @@ -52,7 +52,7 @@ static GtkMenuFactory *subfactory[1]; static GHashTable *entry_ht = NULL; -void get_main_menu(GtkWidget ** menubar, GtkAcceleratorTable ** table, +void get_main_menu(GtkWidget ** menubar, GtkAccelGroup ** table, GtkMenuEntry* menuItems, int nItems) { menu_items = menuItems; @@ -64,7 +64,7 @@ if (menubar) *menubar = subfactory[0]->widget; if (table) - *table = subfactory[0]->table; + *table = subfactory[0]->accel_group; } void menus_init(void) @@ -103,7 +103,7 @@ for (i = 0; i < nmenu_entries; i++) if (entries[i].widget) { - gtk_signal_connect(GTK_OBJECT(entries[i].widget), "install_accelerator", + gtk_signal_connect(GTK_OBJECT(entries[i].widget), "add_accelerator", (GtkSignalFunc) menus_install_accel, entries[i].path); gtk_signal_connect(GTK_OBJECT(entries[i].widget), "remove_accelerator", diff -u -r abi-0.1.3/src/wp/guts/unix/dg_GTKMenu.h abi-0.1.3.patch/src/wp/guts/unix/dg_GTKMenu.h --- abi-0.1.3/src/wp/guts/unix/dg_GTKMenu.h Tue Aug 18 20:33:23 1998 +++ abi-0.1.3.patch/src/wp/guts/unix/dg_GTKMenu.h Fri Oct 16 15:44:11 1998 @@ -23,7 +23,7 @@ #ifndef __dg_UnixMenu_H__ #define __dg_UnixMenu_H__ -void get_main_menu (GtkWidget **menubar, GtkAcceleratorTable **table, +void get_main_menu (GtkWidget **, GtkAccelGroup **, GtkMenuEntry *, int); #endif __dg_UnixMenu_H__ diff -u -r abi-0.1.3/src/wp/guts/unix/dg_UNIXTESTMAIN.cpp abi-0.1.3.patch/src/wp/guts/unix/dg_UNIXTESTMAIN.cpp --- abi-0.1.3/src/wp/guts/unix/dg_UNIXTESTMAIN.cpp Fri Oct 2 18:47:35 1998 +++ abi-0.1.3.patch/src/wp/guts/unix/dg_UNIXTESTMAIN.cpp Fri Oct 16 16:05:00 1998 @@ -63,7 +63,7 @@ GtkWidget* dArea; GtkWidget* table; GtkWidget* vbox; -GtkAcceleratorTable* accel; +GtkAccelGroup* accel_group; void myMenuCallback(GtkWidget*, gpointer); @@ -302,13 +302,13 @@ gtk_table_attach(GTK_TABLE(table), vScroll, 1, 2, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - get_main_menu(&menubar, &accel, menuItems, + get_main_menu(&menubar, &accel_group, menuItems, sizeof(menuItems)/sizeof(menuItems[0])); gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 2); gtk_container_add (GTK_CONTAINER (vbox), table); - gtk_window_add_accelerator_table(GTK_WINDOW(window), accel); + gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); gtk_widget_show(menubar); gtk_widget_show(hScroll); diff -u -r abi-0.1.3/src/wp/guts/win/Makefile abi-0.1.3.patch/src/wp/guts/win/Makefile --- abi-0.1.3/src/wp/guts/win/Makefile Tue Oct 13 21:24:27 1998 +++ abi-0.1.3.patch/src/wp/guts/win/Makefile Fri Oct 16 15:17:01 1998 @@ -91,13 +91,15 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done endif install:: $(TARGETS) @echo Exporting $(TARGETS) from `pwd`... @$(subst xxxx,$(DIST)/bin,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 755 $(TARGETS) $(DIST)/bin + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 755 $$t $(DIST)/bin ; done ################################################################## diff -u -r abi-0.1.3/src/wp/guts/xp/Makefile abi-0.1.3.patch/src/wp/guts/xp/Makefile --- abi-0.1.3/src/wp/guts/xp/Makefile Fri Sep 11 00:51:01 1998 +++ abi-0.1.3.patch/src/wp/guts/xp/Makefile Fri Oct 16 15:17:15 1998 @@ -61,7 +61,10 @@ # WXSTUFF= -D__WXMSW__ -I/AbiSource/wxwin/include -INCLUDES= -I$(DIST)/include -I. -DUT_DEBUG $(WXSTUFF) +INCLUDES= -I$(DIST)/include -I. -I$(ABI_DEPTH)/util/xp \ + -I$(ABI_DEPTH)/wp/fmt/xp \ + -I$(ABI_DEPTH)/wp/ptbl/xp \ + -DUT_DEBUG $(WXSTUFF) TARGETS= $(OBJS) @@ -70,6 +73,7 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) diff -u -r abi-0.1.3/src/wp/impexp/xp/Makefile abi-0.1.3.patch/src/wp/impexp/xp/Makefile --- abi-0.1.3/src/wp/impexp/xp/Makefile Wed Sep 16 23:39:08 1998 +++ abi-0.1.3.patch/src/wp/impexp/xp/Makefile Fri Oct 16 15:18:16 1998 @@ -54,11 +54,13 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) @echo Exporting library $(LIBRARY_NAME) from `pwd`... @$(subst xxxx,$(DIST)/lib,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 444 $$t $(DIST)/lib ; done install:: libs diff -u -r abi-0.1.3/src/wp/ptbl/xp/Makefile abi-0.1.3.patch/src/wp/ptbl/xp/Makefile --- abi-0.1.3/src/wp/ptbl/xp/Makefile Thu Oct 8 00:03:35 1998 +++ abi-0.1.3.patch/src/wp/ptbl/xp/Makefile Fri Oct 16 15:19:00 1998 @@ -106,11 +106,13 @@ export:: $(EXPORT_HEADERS) @echo Exporting headers from `pwd`... @$(subst xxxx,$(DIST)/include,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(EXPORT_HEADERS) $(DIST)/include + @for h in $(EXPORT_HEADERS) ; do \ + $(INSTALL) -m 444 $$h $(DIST)/include ; done libs:: $(TARGETS) @echo Exporting library $(LIBRARY_NAME) from `pwd`... @$(subst xxxx,$(DIST)/lib,$(VERIFY_DIRECTORY)) - @$(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + @for t in $(TARGETS) ; do \ + $(INSTALL) -m 444 $$t $(DIST)/lib ; done install:: libs
--------------9D3DFCA297E14D7DD79C026D Content-Type: text/plain; charset=us-ascii; name="install-sh" Content-Disposition: inline; filename="install-sh" Content-Transfer-Encoding: 7bit
#! /bin/sh # # install - install a program, script, or datafile # This comes from X11R5. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written # from scratch. #
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}" cpprog="${CPPROG-cp}" chmodprog="${CHMODPROG-chmod}" chownprog="${CHOWNPROG-chown}" chgrpprog="${CHGRPPROG-chgrp}" stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}"
tranformbasename="" transform_arg="" instcmd="$mvprog" chmodcmd="$chmodprog 0755" chowncmd="" chgrpcmd="" stripcmd="" rmcmd="$rmprog -f" mvcmd="$mvprog" src="" dst="" dir_arg=""
while [ x"$1" != x ]; do case $1 in -c) instcmd="$cpprog" shift continue;;
-d) dir_arg=true shift continue;;
-m) chmodcmd="$chmodprog $2" shift shift continue;;
-o) chowncmd="$chownprog $2" shift shift continue;;
-g) chgrpcmd="$chgrpprog $2" shift shift continue;;
-s) stripcmd="$stripprog" shift continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'` shift continue;;
-b=*) transformbasename=`echo $1 | sed 's/-b=//'` shift continue;;
*) if [ x"$src" = x ] then src=$1 else # this colon is to work around a 386BSD /bin/sh bug : dst=$1 fi shift continue;; esac done
if [ x"$src" = x ] then echo "install: no input file specified" exit 1 else true fi
if [ x"$dir_arg" != x ]; then dst=$src src="" if [ -d $dst ]; then instcmd=: else instcmd=mkdir fi else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ] then true else echo "install: $src does not exist" exit 1 fi if [ x"$dst" = x ] then echo "install: no destination specified" exit 1 else true fi
# If destination is a directory, append the input filename; if your system # does not like double slashes in filenames, you may need to add some logic
if [ -d $dst ] then dst="$dst"/`basename $src` else true fi fi
## this sed command emulates the dirname command dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists. # this part is taken from Noah Friedman's mkinstalldirs script
# Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then defaultIFS=' ' IFS="${IFS-${defaultIFS}}"
oIFS="${IFS}" # Some sh's can't handle IFS=/ for some reason. IFS='%' set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` IFS="${oIFS}"
pathcomp=''
while [ $# -ne 0 ] ; do pathcomp="${pathcomp}${1}" shift
if [ ! -d "${pathcomp}" ] ; then $mkdirprog "${pathcomp}" else true fi
pathcomp="${pathcomp}/" done fi
if [ x"$dir_arg" != x ] then $doit $instcmd $dst &&
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else
# If we're going to rename the final executable, determine the name now.
if [ x"$transformarg" = x ] then dstfile=`basename $dst` else dstfile=`basename $dst $transformbasename | sed $transformarg`$transformbasename fi
# don't allow the sed command to completely eliminate the filename
if [ x"$dstfile" = x ] then dstfile=`basename $dst` else true fi
# Make a temp file name in the proper directory.
dsttmp=$dstdir/#inst.$$#
# Move or copy the file name to the temp name
$doit $instcmd $src $dsttmp &&
trap "rm -f ${dsttmp}" 0 &&
# and set any options; do chmod last to preserve setuid bits
# If any of these fail, we abort the whole thing. If we want to # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command.
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile && $doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
exit 0
--------------9D3DFCA297E14D7DD79C026D--