$NetBSD: patch-ad,v 1.1 1999/10/14 07:27:35 fredb Exp $ --- makefile.in.orig Mon Mar 23 17:16:21 1998 +++ makefile.in Mon Oct 11 05:36:40 1999 @@ -138,8 +138,8 @@ MSGFMT = @MSGFMT@ XGETTEXT= @XGETTEXT@ INSTALL = @INSTALL@ -INSTALL_data = $(INSTALL) -o root -g root -m 644 -INSTALL_binary = $(INSTALL) -o root -g root -m 755 +INSTALL_data = $(INSTALL) -m 644 +INSTALL_binary = $(INSTALL) -m 755 # # If we need to force debug stuff inclusion. @@ -262,15 +262,18 @@ # # W3C reference library (libwww). -libwww = @libwww@ -libwww_dep = @libwww_dep@ +libwww = libwwwapp libwwwcache libwwwcore libwwwdir libwwwfile libwwwftp \ + libwwwgopher libwwwhtml libwwwhttp libwwwinit libwwwmime libwwwmux \ + libwwwnews libwwwstream libwwwtelnet libwwwtrans libwwwutils libwwwxml \ + libwwwzip libxmltok libxmlparse +libwww_dep = libwww_dir = @libwww_dir@ libwww_version = @libwww_version@ libwww_include = @libwww_include@ libwww_config_h_dir = @libwww_config_h_dir@ libwww_library = @libwww_library@ libwww_make_dir = @libwww_make_dir@ -libwww_make_target = @libwww_make_target@ +libwww_make_target = # @@ -384,9 +387,9 @@ $(sort Library library LibWWW libwww $(libwww) $(libwww_dep)): $(libwww_library) $(libwww_library): - @$(ECHO) - @$(ECHO) "You should build the W3C WWW reference library first!" - @$(ECHO) +# @$(ECHO) +# @$(ECHO) "You should build the W3C WWW reference library first!" +# @$(ECHO) endif @@ -484,11 +487,11 @@ install: $(ArenaBinary) $(ArenaIntlDir)/en/Arena.gmo $(INSTALL_binary) $(ArenaBinary) $(ArenaBinaryINSTALLDir)/$(Arena) $(INSTALL_data) $(ArenaSourceDir)/arenarc $(arenarc_dir) -ifneq ($(strip $(XGETTEXT)),) - ifneq ($(strip $(MSGFMT)),) - $(INSTALL_data) $(ArenaIntlDir)/en/Arena_debug.gmo $(locale_dir)/en/LC_MESSAGES/Arena.mo - endif -endif +#ifneq ($(strip $(XGETTEXT)),) +# ifneq ($(strip $(MSGFMT)),) +# $(INSTALL_data) $(ArenaIntlDir)/en/Arena_debug.gmo $(locale_dir)/en/LC_MESSAGES/Arena.mo +# endif +#endif uninstall: $(RM) $(ArenaBinaryINSTALLDir)/$(Arena) @@ -708,7 +711,7 @@ # # Flags for $(LD) # ~~~~~~~~~~~~~~~ -Libraries = libwww libjpeg libpng libz +Libraries = $(libwww) libjpeg libpng libz LibraryDirs = $(foreach lib, $(Libraries), $(dir $($(lib)_library))) ArenaLibraryDirsLDFLAGS = $(foreach libdir, $(LibraryDirs), -L$(libdir)) L = $(foreach lib, $(Libraries), -l$(basename $(notdir $(lib))-))