debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use POSIX macros for linux

Browse Source
This commit is contained in:
chase
2018-05-24 16:24:41 -05:00
committed by Jon Trulson
parent 164e695cd0
commit 4f5e7fe5e3
265 changed files with 394 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cde/programs/dtlogin/config/Xconfig.src
View File

@@ -64,7 +64,7 @@ Dtlogin*startup: Xstartup
Dtlogin*reset: Xreset
Dtlogin*setup: Xsetup
#if defined (__hpux) || defined (_AIX) || defined (sun) || defined(CSRG_BASED) || defined(linux)
#if defined (__hpux) || defined (_AIX) || defined (sun) || defined(CSRG_BASED) || defined(__linux__)
Dtlogin*failsafeClient: Xfailsafe
#else
Dtlogin*failsafeClient: /usr/bin/X11/xterm
@@ -79,7 +79,7 @@ XCOMM Dtlogin.exportList: ODMDIR NLSPATH TZ ...
Dtlogin.exportList: ODMDIR NLSPATH TZ
#endif
#if defined(CSRG_BASED) || defined(linux)
#if defined(CSRG_BASED) || defined(__linux__)
Dtlogin.exportList: NLSPATH LANG
#endif
@@ -126,7 +126,7 @@ XCOMM To specify a default user PATH environment variable.
XCOMM
XCOMM Dtlogin*userPath: <path>
#if defined(linux) || defined(CSRG_BASED)
#if defined(__linux__) || defined(CSRG_BASED)
Dtlogin*userPath: /bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:CDE_INSTALLATION_TOP/bin
#endif
@@ -161,7 +161,7 @@ XCOMM To specify how long the Login Manager waits to connect to an X-server.
XCOMM
XCOMM Dtlogin*openTimeout: <seconds>
#if defined(CSRG_BASED) || defined(linux)
#if defined(CSRG_BASED) || defined(__linux__)
Dtlogin*openTimeout: 15
Dtlogin*serverAttempts: 3
Dtlogin*wakeupInterval: 20

2
cde/programs/dtlogin/config/Xfailsafe.src
View File

@@ -54,7 +54,7 @@ XCOMM
XCOMM
XCOMM Set background to default weave.
XCOMM
#if defined(linux)
#if defined(__linux__)
XDIR=/usr/bin
#endif
#if defined(__FreeBSD__)

2
cde/programs/dtlogin/config/Xservers.src
View File

@@ -103,7 +103,7 @@ XCOMM ##########################################################################
* Local local@console /usr/bin/X11/X :0
#elif defined (_NO_CONSOLE)
XCOMM * Local local@console /usr/bin/X11/X :0
#elif defined (linux)
#elif defined (__linux__)
:0 Local local_uid@tty1 root /usr/bin/X :0
#elif defined (__OpenBSD__)
:0 Local local@console /usr/X11R6/bin/X :0

2
cde/programs/dtlogin/config/Xsetup.src
View File

@@ -56,7 +56,7 @@ fi
#ifdef sun
XDIR=/usr/openwin/bin
#elif defined(linux)
#elif defined(__linux__)
XDIR=/usr/bin
#elif defined(__OpenBSD__)
XDIR=/usr/X11R6/bin

4
cde/programs/dtlogin/config/_common.ksh.src
View File

@@ -34,7 +34,7 @@
HASH
#if defined(__OpenBSD__) || defined(__NetBSD__)
pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $5}')
#elif defined(linux)
#elif defined(__linux__)
pexec=$(LC_TIME=C /bin/ps -p $PPID 2>/dev/null | awk 'NR==2 {print $4}')
#elif defined(__FreeBSD__)
pexec=$(LC_TIME=C /bin/ps -o comm= -p $PPID 2>/dev/null)
@@ -304,7 +304,7 @@ SetKeyboardMap()
#endif
#endif
#if defined(linux)
#if defined(__linux__)
#ifdef cpp_Xsetup
if [ "$DTXSERVERLOCATION" != "remote" ]; then
fontpath=