>Number:         28399
>Category:       xsrc
>Synopsis:       latest change to xfree/xc/programs/xconsole/Imakefile was apparently not tested on 1.6.x
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Nov 23 18:30:00 +0000 2004
>Originator:     Greg A. Woods
>Release:        NetBSD 1.6.2_STABLE
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD always 1.6.2_STABLE NetBSD 1.6.2_STABLE (GENERIC) #0: Wed Oct 13 19:26:55 EDT 2004 woods@always:/build/woods/always/NetBSD-1.6.x-i386-i386-obj/mfbd/woods/m-NetBSD-1.6/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:

it seems the latest change to xfree/xc/programs/xconsole/Imakefile was
not tested on 1.6.x -- it may not even work on -current....

The change from using the Imake ComplexProgramTarget() macro to an
incomplete attempt to use the AllTarget() and SingleProgramTarget()
macros was inadvisable and resulted in no xconsole binary or manual page
being installed.  The former was correct and complete in the first place
and only a minor variable setting needed to be changed to add PTYLIB.

>How-To-Repeat:

	try to build a release with X11 sets and see the following:

cd /usr/src/distrib/sets &&  DESTDIR=/build/woods/always/NetBSD-1.6.x-i386-ppro-destdir  MACHINE=i386 MACHINE_ARCH=i386  MAKE=make MTREE= PAX= sh ./checkflist -x11 -M /build/woods/always/NetBSD-1.6.x-i386-ppro-destdir/METALOG.X11
99d98
< ./usr/X11R6/bin/xconsole
6273d6271
< ./usr/X11R6/share/man/cat1/xconsole.0
checkflist: flist inconsistencies found
checkflist: key to output:
  <  file in flist but missing from DESTDIR
  >  file in DESTDIR but missing from flist
*** Error code 1

Stop.
make: stopped in /build/woods/always/NetBSD-1.6.x-i386-i386-ppro-obj/xsrc


>Fix:

	Revert to using ComplexProgramTarget()

Index: xfree/xc/programs/xconsole/Imakefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/xsrc/xfree/xc/programs/xconsole/Imakefile,v
retrieving revision 1.2
diff -u -r1.2 Imakefile
--- xfree/xc/programs/xconsole/Imakefile	10 Nov 2004 03:31:17 -0000	1.2
+++ xfree/xc/programs/xconsole/Imakefile	23 Nov 2004 18:14:25 -0000
@@ -1,10 +1,4 @@
 XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:13 cpqbld Exp $
-          SRCS = xconsole.c
-          OBJS = xconsole.o
-       PROGRAMS = xconsole
-        DEPLIBS = XawClientDepLibs
-LOCAL_LIBRARIES = XawClientLibs
-
 
 #if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
     (defined(LinuxArchitecture) && \
@@ -12,9 +6,13 @@
        PTYLIB = -lutil  
 #endif
 
-AllTarget(${PROGRAMS})
+          SRCS = xconsole.c
+          OBJS = xconsole.o
+       PROGRAMS = xconsole
+        DEPLIBS = XawClientDepLibs
+LOCAL_LIBRARIES = $(PTYLIB) XawClientLibs
 
-SingleProgramTarget(xconsole,$(OBJS),${DEPLIBS},${LOCAL_LIBRARIES} $(PTYLIB))
 
+ComplexProgramTarget(xconsole)
 
 InstallAppDefaults(XConsole)