aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-06-06 20:33:55 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-06-06 20:33:55 +0200
commit7fd59fbd1effa4eb54fb338239f22ff8a23d9da6 (patch)
treecc1d12018e9257a2baf4690c0771d7eca86ed333
parent7b00b7bb8dbf1dc680d1a7b52b425270c95adad7 (diff)
parent52d65a4f6aec2a2d41472a20eb5e861172d53832 (diff)
downloadnx-libs-7fd59fbd1effa4eb54fb338239f22ff8a23d9da6.tar.gz
nx-libs-7fd59fbd1effa4eb54fb338239f22ff8a23d9da6.tar.bz2
nx-libs-7fd59fbd1effa4eb54fb338239f22ff8a23d9da6.zip
Merge branch 'uli42-pr/remove_unused_defines' into 3.6.x
Attributes GH PR #456: https://github.com/ArcticaProject/nx-libs/pull/456
-rw-r--r--nx-X11/config/cf/Imake.tmpl14
-rw-r--r--nx-X11/config/cf/host.def2
-rw-r--r--nx-X11/config/cf/linux.cf1
3 files changed, 0 insertions, 17 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 9deeb302d..15e3a9ad3 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -229,10 +229,6 @@ XCOMM the platform-specific parameters - edit site.def to change
#define PerlEnvSetup env LC_ALL=C
#endif
-#ifndef BuildRman
-#define BuildRman YES
-#endif
-
#ifndef HasGperf
#define HasGperf NO
#endif
@@ -242,19 +238,9 @@ XCOMM the platform-specific parameters - edit site.def to change
#endif
#ifndef RmanCmd
-#if BuildRman
-#ifdef UseInstalled /* assume BINDIR in path */
-#define RmanCmd rman
-#else
-#define RmanCmd $(TOP)/config/util/rman
-#endif
-#endif
#endif
#ifndef RmanOptions
-#if BuildRman
-#define RmanOptions -f HTML
-#endif
#endif
#ifndef BuildHtmlManPages
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 4d49362f9..4a11359e2 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -537,5 +537,3 @@
*
#define X86EMU_LIBPATH /usr/local/lib
*/
-
-#define BuildRman NO
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 9a3e3ceb2..cd34555e6 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -127,7 +127,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define ForceNormalLib YES
# define BuildSpecsDocs YES
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
-# define BuildRman NO
# define BuildHtmlManPages NO
/* m68k has no 2.4 kernel yet */