open-src/app/xdm/Makefile
changeset 1199 b6706e7f1c36
parent 1197 0dc02fa0d678
equal deleted inserted replaced
1198:0659f00c1f53 1199:b6706e7f1c36
    42 # Patches to apply to source after unpacking, in order
    42 # Patches to apply to source after unpacking, in order
    43 SOURCE_PATCHES = \
    43 SOURCE_PATCHES = \
    44 	mkdir.patch,-p1 \
    44 	mkdir.patch,-p1 \
    45 	pam_tty.patch,-p1 \
    45 	pam_tty.patch,-p1 \
    46 	pam_user.patch,-p1 \
    46 	pam_user.patch,-p1 \
    47 	bindir.patch \
    47 	bindir.patch,-p1 \
    48 	terminateServer.patch \
    48 	terminateServer.patch \
    49 	bug-6822636.patch \
    49 	bug-6822636.patch \
    50 	bug-6820612.patch,-p1 \
    50 	bug-6820612.patch,-p1 \
    51 	Xsession.patch
    51 	Xsession.patch
       
    52 
       
    53 # Need to rebuild configure/Makefile.in after applying bindir.patch
       
    54 AUTORECONF=yes
    52 
    55 
    53 # Man pages to apply Sun footer to & attributes to list
    56 # Man pages to apply Sun footer to & attributes to list
    54 SUNTOUCHED_MANPAGES=xdm.man.cpp
    57 SUNTOUCHED_MANPAGES=xdm.man.cpp
    55 MODULE_STABILITY=Committed
    58 MODULE_STABILITY=Committed
    56 MODULE_SUNTOUCH_MAN_FLAGS= -p $(MODULE_PREFIX)/sbin/
    59 MODULE_SUNTOUCH_MAN_FLAGS= -p $(MODULE_PREFIX)/sbin/
    60 MODULE_PREFIX_SET=yes
    63 MODULE_PREFIX_SET=yes
    61 
    64 
    62 # Additional configure script options
    65 # Additional configure script options
    63 # Only build shared greeter module, not static
    66 # Only build shared greeter module, not static
    64 # Set various paths to better match Solaris
    67 # Set various paths to better match Solaris
       
    68 # Find xrdb & xterm in /usr/bin even with --bindir set to /usr/sbin
    65 MODULE_CONFIG_OPTS= \
    69 MODULE_CONFIG_OPTS= \
    66 	--enable-shared=yes --enable-static=no \
    70 	--enable-shared=yes --enable-static=no \
    67 	--with-xdmconfigdir=/etc/X11/xdm \
    71 	--with-xdmconfigdir=/etc/X11/xdm \
    68 	--with-piddir=/var/run/xdm \
    72 	--with-piddir=/var/run/xdm \
    69 	--with-authdir=/var/run/xdm \
    73 	--with-authdir=/var/run/xdm \
    70 	--bindir=/usr/sbin \
    74 	--bindir=/usr/sbin \
       
    75 	--with-xrdb='$(X11_BIN_DIR)/xrdb' \
       
    76 	--with-default-session=command='$(X11_BIN_DIR)/xterm -ls' \
       
    77 	DEF_SERVER='$(X11_BIN_DIR)/X' \
    71 	DEF_USER_PATH=/usr/bin:/usr/sbin \
    78 	DEF_USER_PATH=/usr/bin:/usr/sbin \
    72 	DEF_SYSTEM_PATH=/usr/bin:/usr/sbin
    79 	DEF_SYSTEM_PATH=/usr/bin:/usr/sbin
    73 
    80 
    74 # configure scripts add libraries like -lXt & -lXinerama to the global $(LIBS)
    81 # configure scripts add libraries like -lXt & -lXinerama to the global $(LIBS)
    75 # when only some objects need them, so ignore them in the rest.
    82 # when only some objects need them, so ignore them in the rest.