Attachment #28361 for bug #46225

Lines 269-275 Link Here

(-)ion-2-20040207/configure (-1 / +1 lines)
269		269
270	# Identity of this package.	270	# Identity of this package.
271	PACKAGE_NAME='Ion Window Manager'	271	PACKAGE_NAME='Ion Window Manager'
272	PACKAGE_TARNAME='ion'	272	PACKAGE_TARNAME='ion2'
273	PACKAGE_VERSION='2-20040207'	273	PACKAGE_VERSION='2-20040207'
274	PACKAGE_STRING='Ion Window Manager 2-20040207'	274	PACKAGE_STRING='Ion Window Manager 2-20040207'
275	PACKAGE_BUGREPORT='tuomov@iki.fi'	275	PACKAGE_BUGREPORT='tuomov@iki.fi'

Lines 5-11 Link Here

(-)ion-2-20040207/configure.ac (-1 / +1 lines)
5	AC_INIT([Ion Window Manager],	5	AC_INIT([Ion Window Manager],
6	[2-20040207],	6	[2-20040207],
7	[tuomov@iki.fi],	7	[tuomov@iki.fi],
8	[ion])	8	[ion2])
9	AC_PREREQ([2.58])	9	AC_PREREQ([2.58])
10	AC_REVISION([$Revision: 1.16 $])	10	AC_REVISION([$Revision: 1.16 $])
11		11

Lines 35-41 Link Here

(-)ion-2-20040207/ion/Makefile (-3 / +3 lines)
35		35
36	SOURCES=ion.c	36	SOURCES=ion.c
37		37
38	TARGETS=ion	38	TARGETS=ion2
39		39
40	######################################	40	######################################
41		41
Lines 43-51 Link Here
43		43
44	######################################	44	######################################
45		45
46	ion: $(OBJS) $(EXT_OBJS)	46	ion2: $(OBJS) $(EXT_OBJS)
47	$(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@	47	$(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
48		48
49	_install:	49	_install:
50	$(INSTALLDIR) $(BINDIR)	50	$(INSTALLDIR) $(BINDIR)
51	$(INSTALL) -s -m $(BIN_MODE) ion $(BINDIR)	51	$(INSTALL) -s -m $(BIN_MODE) ion2 $(BINDIR)

Lines 93-99 Link Here

(-)ion-2-20040207/ioncore/modules.c (-1 / +1 lines)
93	/*EXTL_DOC	93	/*EXTL_DOC
94	* Attempt to load module \var{modname}. Ion will use libltdl to search	94	* Attempt to load module \var{modname}. Ion will use libltdl to search
95	* the library path (the default setting is \file{\~{}/.ion2/libs} and	95	* the library path (the default setting is \file{\~{}/.ion2/libs} and
96	* \file{\$PREFIX/lib/ion}) and also try diffent extensions, so only	96	* \file{\$PREFIX/lib/ion2}) and also try diffent extensions, so only
97	* the module name should usually be necessary to give here.	97	* the module name should usually be necessary to give here.
98	*/	98	*/
99	EXTL_EXPORT	99	EXTL_EXPORT

Lines 2-8 Link Here

(-)ion-2-20040207/man/ion.1.in (-2 / +2 lines)
2	.SH NAME	2	.SH NAME
3	Ion - an X11 window manager	3	Ion - an X11 window manager
4	.SH SYNOPSIS	4	.SH SYNOPSIS
5	.B ion	5	.B ion2
6	.I "[options]"	6	.I "[options]"
7	.SH "DESCRIPTION"	7	.SH "DESCRIPTION"
8		8
Lines 429-435 Link Here
429	.PP	429	.PP
430	.I DOCDIR/	430	.I DOCDIR/
431	.PP	431	.PP
432	\fIX(7x)\fP, \fIpwm(1)\fP	432	\fIX(7x)\fP, \fIpwm2(1)\fP
433		433
434	.SH AUTHOR	434	.SH AUTHOR
435	Ion was written by Tuomo Valkonen <tuomov at iki.fi>.	435	Ion was written by Tuomo Valkonen <tuomov at iki.fi>.

Lines 6-12 Link Here

(-)ion-2-20040207/man/ion.1.in.txt (-2 / +2 lines)
6	Ion - an X11 window manager	6	Ion - an X11 window manager
7		7
8	SYNOPSIS	8	SYNOPSIS
9	ion [options]	9	ion2 [options]
10		10
11	DESCRIPTION	11	DESCRIPTION
12	Ion is a tiling tabbed window manager designed with keyboard users in	12	Ion is a tiling tabbed window manager designed with keyboard users in
Lines 408-414 Link Here
408		408
409	DOCDIR/	409	DOCDIR/
410		410
411	X(7x), pwm(1)	411	X(7x), pwm2(1)
412		412
413		413
414	AUTHOR	414	AUTHOR

Lines 21-28 Link Here

(-)ion-2-20040207/man/Makefile (-2 / +2 lines)
21		21
22	_install:	22	_install:
23	$(INSTALLDIR) $(MANDIR)/man1	23	$(INSTALLDIR) $(MANDIR)/man1
24	$(INSTALL) -m $(DATA_MODE) ion.1 $(MANDIR)/man1	24	$(INSTALL) -m $(DATA_MODE) ion.1 $(MANDIR)/man1/ion2.1
25	$(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR)/man1	25	$(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR)/man1/pwm2.1
26		26
27	#	27	#
28	# Awful hack that may not work on the user's system. This is rule is	28	# Awful hack that may not work on the user's system. This is rule is

Lines 2-8 Link Here

(-)ion-2-20040207/man/pwm.1.in (-2 / +2 lines)
2	.SH NAME	2	.SH NAME
3	PWM - An X11 window manager	3	PWM - An X11 window manager
4	.SH SYNOPSIS	4	.SH SYNOPSIS
5	.B pwm	5	.B pwm2
6	.I "[options]"	6	.I "[options]"
7	.SH "DESCRIPTION"	7	.SH "DESCRIPTION"
8		8
Lines 75-79 Link Here
75	.SH SEE ALSO	75	.SH SEE ALSO
76		76
77	For more information, see	77	For more information, see
78	\fIion(1)\fP.	78	\fIion2(1)\fP.
79		79





SOURCES = pwm.c
ETC = pwm.lua pwm-menus.lua pwm-bindings.lua
TARGETS = pwm2

######################################



######################################

pwm2: $(OBJS) $(EXT_OBJS)
	$(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@

_install:
	$(INSTALLDIR) $(BINDIR)
	$(INSTALL) -s -m $(BIN_MODE) pwm2 $(BINDIR)
	# $(STRIP) $(BINDIR)/pwm2
	$(INSTALLDIR) $(PWM_ETCDIR)
	for i in $(ETC); do \
		$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \




# Main binaries
BINDIR=$(PREFIX)/bin
# Configuration .lua files
ETCDIR=$(PREFIX)/etc/ion2
# Some .lua files and ion-* shell scripts
SHAREDIR=$(PREFIX)/share/ion2
# Manual pages
MANDIR=$(PREFIX)/share/man
# Some documents
DOCDIR=$(PREFIX)/share/doc/ion2
# Nothing at the moment
INCDIR=$(PREFIX)/include/ion2
# Nothing at the moment
LIBDIR=$(PREFIX)/lib
# Modules
MODULEDIR=$(LIBDIR)/ion2
# ion-completefile (does not belong in SHAREDIR being a binary file)
EXTRABINDIR=$(LIBDIR)/ion2

##
## Modules

Return to bug 46225

Lines 41-47 Link Here

(-)ion-2-20040207/pwm/Makefile (-4 / +4 lines)
41		41
42	SOURCES = pwm.c	42	SOURCES = pwm.c
43	ETC = pwm.lua pwm-menus.lua pwm-bindings.lua	43	ETC = pwm.lua pwm-menus.lua pwm-bindings.lua
44	TARGETS = pwm	44	TARGETS = pwm2
45		45
46	######################################	46	######################################
47		47
Lines 49-61 Link Here
49		49
50	######################################	50	######################################
51		51
52	pwm: $(OBJS) $(EXT_OBJS)	52	pwm2: $(OBJS) $(EXT_OBJS)
53	$(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@	53	$(LIBTOOL) --mode=link $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
54		54
55	_install:	55	_install:
56	$(INSTALLDIR) $(BINDIR)	56	$(INSTALLDIR) $(BINDIR)
57	$(INSTALL) -s -m $(BIN_MODE) pwm $(BINDIR)	57	$(INSTALL) -s -m $(BIN_MODE) pwm2 $(BINDIR)
58	# $(STRIP) $(BINDIR)/pwm	58	# $(STRIP) $(BINDIR)/pwm2
59	$(INSTALLDIR) $(PWM_ETCDIR)	59	$(INSTALLDIR) $(PWM_ETCDIR)
60	for i in $(ETC); do \	60	for i in $(ETC); do \
61	$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \	61	$(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \

Lines 15-35 Link Here

(-)ion-2-20040207/system.mk (-6 / +6 lines)
15	# Main binaries	15	# Main binaries
16	BINDIR=$(PREFIX)/bin	16	BINDIR=$(PREFIX)/bin
17	# Configuration .lua files	17	# Configuration .lua files
18	ETCDIR=$(PREFIX)/etc/ion	18	ETCDIR=$(PREFIX)/etc/ion2
19	# Some .lua files and ion-* shell scripts	19	# Some .lua files and ion-* shell scripts
20	SHAREDIR=$(PREFIX)/share/ion	20	SHAREDIR=$(PREFIX)/share/ion2
21	# Manual pages	21	# Manual pages
22	MANDIR=$(PREFIX)/share/man	22	MANDIR=$(PREFIX)/share/man
23	# Some documents	23	# Some documents
24	DOCDIR=$(PREFIX)/share/doc/ion	24	DOCDIR=$(PREFIX)/share/doc/ion2
25	# Nothing at the moment	25	# Nothing at the moment
26	INCDIR=$(PREFIX)/include/ion	26	INCDIR=$(PREFIX)/include/ion2
27	# Nothing at the moment	27	# Nothing at the moment
28	LIBDIR=$(PREFIX)/lib	28	LIBDIR=$(PREFIX)/lib
29	# Modules	29	# Modules
30	MODULEDIR=$(LIBDIR)/ion	30	MODULEDIR=$(LIBDIR)/ion2
31	# ion-completefile (does not belong in SHAREDIR being a binary file)	31	# ion-completefile (does not belong in SHAREDIR being a binary file)
32	EXTRABINDIR=$(LIBDIR)/ion	32	EXTRABINDIR=$(LIBDIR)/ion2
33		33
34	##	34	##
35	## Modules	35	## Modules