Differential D4847 Diff 12095 irc/scrollz/files/patch-Makefile.in

Changeset View

Standalone View

irc/scrollz/files/patch-Makefile.in

	--- Makefile.in.orig 2011-04-29 17:21:18.000000000 +0900			--- Makefile.in.orig 2015-11-10 09:47:09 UTC
	+++ Makefile.in 2013-03-09 19:35:03.628110600 +0900			+++ Makefile.in
	@@ -31,14 +31,14 @@			@@ -50,7 +50,7 @@
	# @(#)$Id: Makefile.in,v 1.23 2006-10-31 12:31:27 f Exp $

	# targets recognised by this makefile:
	-# all, everything - compiles ircii, ircio, ircflush and wserv
	+# all, everything - compiles ircii, ircio, ircflush and wservz
	# ircio - compiles ircio
	# ircflush - compiles ircflush
	-# wserv - compiles wserv
	-# install - installs ircii, ircio, ircflush and wserv
	+# wservz - compiles wservz
	+# install - installs ircii, ircio, ircflush and wservz
	# installirc - installs ircii
	# installio - installs ircio
	-# installwserv - installs wserv
	+# installwservz - installs wservz
	# installflush - installs ircflush
	# installscript - installs the scripts
	# installhelp - installs the help files
	@@ -50,8 +50,8 @@
	prefix = @prefix@			prefix = @prefix@
	exec_prefix = @exec_prefix@			exec_prefix = @exec_prefix@
	bindir = @bindir@			bindir = @bindir@
	-sharedir = @prefix@/share			-sharedir = @prefix@/share
	-mandir = @prefix@/share/man/man1
	+sharedir = @datadir@			+sharedir = @datadir@
	+mandir = @mandir@/man1			datarootdir = @datarootdir@
				mandir = @mandir@

	DESTDIR =			@@ -106,7 +106,7 @@ INSTALL_IRCFLUSH = $(bindir)/ircflush

	@@ -105,7 +105,7 @@

	# This program allows you to use screen/xterm's to put new irc windows			# This program allows you to use screen/xterm's to put new irc windows
	# on new screen/xterm windows.			# on new screen/xterm windows.
	-INSTALL_WSERV = $(bindir)/wserv			-INSTALL_WSERV = $(bindir)/wserv
	+INSTALL_WSERVZ = $(bindir)/wservz			+INSTALL_WSERVZ = $(bindir)/wservz

	# This command will be used to install the irc help files. If you don't			# This command will be used to install the irc help files. If you don't
	# want to install them, replace with the following:			# want to install them, replace with the following:
	@@ -126,14 +126,13 @@			@@ -127,14 +127,13 @@ INSTALL_DATA = ./bsdinstall -c -m 644
	VERSION = @VERSION@			VERSION = @VERSION@

	SHELL = /bin/sh			SHELL = /bin/sh
	-MAKE = make $(MFLAGS)			-MAKE = make $(MFLAGS)
	MFLAGS ='CC=$(CC)' \			MFLAGS ='CC=$(CC)' \
	'CFLAGS=$(CFLAGS)' \			'CFLAGS=$(CFLAGS)' \
	'DEFS=$(DEFS)' \			'DEFS=$(DEFS)' \
	'HELP_DIR=$(HELP_DIR)' \			'HELP_DIR=$(HELP_DIR)' \
	'INSTALL_IRC=$(INSTALL_IRC)' \			'INSTALL_IRC=$(INSTALL_IRC)' \
	'INSTALL_IRCIO=$(INSTALL_IRCIO)' \			'INSTALL_IRCIO=$(INSTALL_IRCIO)' \
	- 'INSTALL_WSERV=$(INSTALL_WSERV)' \			- 'INSTALL_WSERV=$(INSTALL_WSERV)' \
	+ 'INSTALL_WSERVZ=$(INSTALL_WSERVZ)' \			+ 'INSTALL_WSERVZ=$(INSTALL_WSERVZ)' \
	'IRCSHARE=$(IRCSHARE)' \			'IRCSHARE=$(IRCSHARE)' \
	'IRCPATH=$(IRC_PATH)' \			'IRCPATH=$(IRC_PATH)' \
	'LDFLAGS=$(LDFLAGS)' \			'LDFLAGS=$(LDFLAGS)' \
	@@ -143,32 +142,23 @@			@@ -144,32 +143,23 @@ MFLAGS ='CC=$(CC)' \
	'LN=$(LN)' \			'LN=$(LN)' \
	'RM=$(RM)'			'RM=$(RM)'

	-all: scrollz scrollz.1			-all: scrollz scrollz.1
	+all: scrollz scrollz.1 wservz			+all: scrollz scrollz.1 wservz

	-install: all installbin installdirs installman installhelp			-install: all installbin installdirs installman installhelp
	+install: all installbin installwservz installdirs installman installhelp			+install: all installbin installwservz installdirs installman installhelp

	-scrollz: source/Makefile Makefile			-scrollz: source/Makefile Makefile
	- @cd source; $(MAKE) all			- @cd source; $(MAKE) all
	+scrollz ircio ircflush wservz: source/Makefile Makefile			+scrollz ircio ircflush wservz: source/Makefile Makefile
	+ $(MAKE) -C source $(MFLAGS) $@			+ $(MAKE) -C source $(MFLAGS) $@
				koobsUnsubmitted Done Inline Actions Why was this change necessary? koobs: Why was this change necessary?
				brnrdAuthorUnsubmitted Not Done Inline Actions Fixed. Typo when re-rolling the patch. brnrd: Fixed. Typo when re-rolling the patch.

	scrollz.1: scrollz.1.in			scrollz.1: scrollz.1.in
	sed -e "s,SHAREDIR,$(IRCSHARE)," < scrollz.1.in > scrollz.1			sed -e "s,SHAREDIR,$(IRCSHARE)," < scrollz.1.in > scrollz.1

	installeverything: install installman installflush installio \			installeverything: install installman installflush installio \
	- installwserv installhelp			- installwserv installhelp
	+ installwservz installhelp			+ installwservz installhelp

	Show All 9 Lines
	- @cd source; $(MAKE) ircflush			- @cd source; $(MAKE) ircflush
	-			-
	-wserv: source/wserv.c source/term.c source/Makefile			-wserv: source/wserv.c source/term.c source/Makefile
	- @cd source; $(MAKE) wserv			- @cd source; $(MAKE) wserv
	-			-
	installbin: installirc			installbin: installirc

	installirc: scrollz installdirs			installirc: scrollz installdirs
	@@ -189,8 +179,8 @@			@@ -181,7 +171,7 @@ installirc: scrollz installdirs
				@cp doc/ScrollZ.doc $(DESTDIR)/$(IRCDOC)

				installman: installdirs scrollz.1
				- $(INSTALL_DATA) scrollz.1 $(DESTDIR)/$(mandir)
				+ $(INSTALL_DATA) scrollz.1 $(DESTDIR)/$(mandir)/man1
				koobsUnsubmitted Done Inline Actions Can you use the CONFIGURE_ARGS --mandir for this? koobs: Can you use the CONFIGURE_ARGS --mandir for this?
				brnrdAuthorUnsubmitted Not Done Inline Actions Added --mandir=${MANDIR}/man1 only to find out that ports framework adds another --mandir=${MANDIR} to the ARGS and the last one is used by configure. brnrd: Added --mandir=${MANDIR}/man1 only to find out that ports framework adds another…
				koobsUnsubmitted Done Inline Actions So, this change is not needed anymore? koobs: So, this change is not needed anymore?
				koobsUnsubmitted Done Inline Actions So this change is not needed then? koobs: So this change is not needed then?
				brnrdAuthorUnsubmitted Not Done Inline Actions Still required, otherwise man-page is installed in /usr/local/man/scrollz.1 brnrd: Still required, otherwise man-page is installed in /usr/local/man/scrollz.1

				installserv: installio
				installio: ircio installdirs
				@@ -190,8 +180,8 @@ installio: ircio installdirs
	installflush: ircflush installdirs			installflush: ircflush installdirs
	$(INSTALL) source/ircflush $(DESTDIR)/$(INSTALL_IRCFLUSH)			$(INSTALL) source/ircflush $(DESTDIR)/$(INSTALL_IRCFLUSH)

	-installwserv: wserv installdirs			-installwserv: wserv installdirs
	- $(INSTALL) source/wserv $(DESTDIR)/$(INSTALL_WSERV)			- $(INSTALL) source/wserv $(DESTDIR)/$(INSTALL_WSERV)
	+installwservz: wservz installdirs			+installwservz: wservz installdirs
	+ $(INSTALL) source/wservz $(DESTDIR)/$(INSTALL_WSERVZ)			+ $(INSTALL) source/wservz $(DESTDIR)/$(INSTALL_WSERVZ)

	installdirs:			installdirs:
	umask 022; ./mkinstalldirs $(DESTDIR)/$(IRCSHARE) $(DESTDIR)/$(bindir) \			umask 022; ./mkinstalldirs $(DESTDIR)/$(IRCSHARE) $(DESTDIR)/$(bindir) \