Attachment #311951 for bug #412201





SUBDIRS = \
	include \
	disk-utils \
	fdisk \
	getopt \
	lib \
	$(SHLIBS_DIRS) \
	$(MAN_DIRS) \
	login-utils \
	misc-utils \
	po \
	sys-utils
	term-utils \
	text-utils \
	tests


RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \

Lines 2-8 include $(top_srcdir)/config/include-Makefile.am Link Here

(-)a/lib/Makefile.am (-1 / +1 lines)
2		2
3	AM_CPPFLAGS += -DTEST_PROGRAM	3	AM_CPPFLAGS += -DTEST_PROGRAM
4		4
5	noinst_PROGRAMS = test_blkdev test_ismounted test_wholedisk test_mangle \	5	noinst_PROGRAMS = test_blkdev test_wholedisk test_mangle \
6	test_tt test_canonicalize test_strutils test_procutils \	6	test_tt test_canonicalize test_strutils test_procutils \
7	test_at	7	test_at
8	if LINUX	8	if LINUX





bin_PROGRAMS =
sbin_PROGRAMS =
usrbin_exec_PROGRAMS = flock
usrsbin_exec_PROGRAMS = 

dist_man_MANS = flock.1
		readprofile.8

if LINUX
#

dist_man_MANS += arch.1
endif

SETARCH_LINKS = 

SETARCH_MAN_LINKS = 
SETARCH_LINKS += s390 s390x
endif
if ARCH_I86
SETARCH_LINKS += i386
endif
if ARCH_86_64
SETARCH_LINKS += i386 x86_64
endif
if ARCH_PPC
SETARCH_LINKS += ppc ppc64 ppc32
endif
if ARCH_SPARC
SETARCH_LINKS += sparc sparc64 sparc32 sparc32bash
endif
if ARCH_MIPS
SETARCH_LINKS += mips mips64 mips32
endif
if ARCH_IA64
SETARCH_LINKS += i386 ia64
endif
if ARCH_HPPA
SETARCH_LINKS += parisc parisc64 parisc32
endif

SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8)
man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS)
CLEANFILES = $(man_MANS)


Return to bug 412201

Lines 2-12 include $(top_srcdir)/config/include-Makefile.am Link Here

(-)a/sys-utils/Makefile.am (-31 / +5 lines)
2		2
3	bin_PROGRAMS =	3	bin_PROGRAMS =
4	sbin_PROGRAMS =	4	sbin_PROGRAMS =
5	usrbin_exec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid	5	usrbin_exec_PROGRAMS = flock
6	usrsbin_exec_PROGRAMS = readprofile	6	usrsbin_exec_PROGRAMS =
7		7
8	dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \	8	dist_man_MANS = flock.1
9	readprofile.8
10		9
11	if LINUX	10	if LINUX
12	#	11	#
Lines 168-201 bin_PROGRAMS += arch Link Here
168	dist_man_MANS += arch.1	167	dist_man_MANS += arch.1
169	endif	168	endif
170		169
171	SETARCH_LINKS = linux32 linux64	170	SETARCH_LINKS =
172		171
173	if ARCH_S390	172	SETARCH_MAN_LINKS =
174	SETARCH_LINKS += s390 s390x
175	endif
176	if ARCH_I86
177	SETARCH_LINKS += i386
178	endif
179	if ARCH_86_64
180	SETARCH_LINKS += i386 x86_64
181	endif
182	if ARCH_PPC
183	SETARCH_LINKS += ppc ppc64 ppc32
184	endif
185	if ARCH_SPARC
186	SETARCH_LINKS += sparc sparc64 sparc32 sparc32bash
187	endif
188	if ARCH_MIPS
189	SETARCH_LINKS += mips mips64 mips32
190	endif
191	if ARCH_IA64
192	SETARCH_LINKS += i386 ia64
193	endif
194	if ARCH_HPPA
195	SETARCH_LINKS += parisc parisc64 parisc32
196	endif
197
198	SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8)
199	man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS)	173	man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS)
200	CLEANFILES = $(man_MANS)	174	CLEANFILES = $(man_MANS)
201		175

Lines 18-36 MAN_DIRS = man/ru Link Here

(-)a/Makefile.am (-10 / +1 lines)
18		18
19	SUBDIRS = \	19	SUBDIRS = \
20	include \	20	include \
21	disk-utils \
22	fdisk \
23	getopt \
24	lib \
25	$(SHLIBS_DIRS) \	21	$(SHLIBS_DIRS) \
26	$(MAN_DIRS) \	22	$(MAN_DIRS) \
27	login-utils \
28	misc-utils \
29	po \	23	po \
30	sys-utils \	24	sys-utils
31	term-utils \
32	text-utils \
33	tests
34		25
35		26
36	RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \	27	RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \