diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-06-30 12:37:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-06-30 12:37:04 +0200 |
| commit | 314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c (patch) | |
| tree | 4ca541c9c14b9b015e5f12227e784a7a418d8d9a /nx-X11/config | |
| parent | e18eb77f397b72c1a10141d2bafa2dc975ab7d38 (diff) | |
| parent | 8f3b446b1336d2c54690468c062c3098df96ba96 (diff) | |
| download | nx-libs-314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c.tar.gz nx-libs-314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c.tar.bz2 nx-libs-314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c.zip | |
Merge branch 'uli42-pr/various10' into 3.6.x
Attribute GH PR #1075: https://github.com/ArcticaProject/nx-libs/pull/1075
Diffstat (limited to 'nx-X11/config')
| -rw-r--r-- | nx-X11/config/cf/Imake.rules | 8 | ||||
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 2 | ||||
| -rw-r--r-- | nx-X11/config/cf/lnxLib.rules | 6 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 9 |
4 files changed, 9 insertions, 16 deletions
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index ac3b78da2..005869280 100644 --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@ -547,7 +547,7 @@ clean cleantc:: @@\ :; \ @@\ else \ @@\ if [ -h dir ]; then \ @@\ - (test -n "${VERBOSE}" && test -n "${VERBOSE}" && set -x; rm -f dir); \ @@\ + (test -n "${VERBOSE}" && set -x; rm -f dir); \ @@\ fi; \ @@\ (test -n "${VERBOSE}" && set -x; $(MKDIRHIER) dir); \ @@\ fi @@ -1107,7 +1107,7 @@ CplusplusProgramTargetHelper(program,SRCS10,OBJS10,DEPLIBS10,locallib,syslib) #ifndef RMoveToBakFile #define RMoveToBakFile(file) -@if [ -f file ]; then test -n "${VERBOSE}" && set -x; \ @@\ - RemoveFile(file.bak); @$(MV) file file.bak; \ @@\ + RemoveFile(file.bak); $(MV) file file.bak; \ @@\ else exit 0; fi #endif /* RMoveToBakFile */ @@ -1976,7 +1976,7 @@ DependDependencyStatement() @@\ NoCmpScript(ProgramTargetName($(DEPEND))) @@\ @@\ ProgramTargetName($(DEPEND)): @@\ - echo "using system-wide depend, continuing in $(CURRENT_DIR)" + @test -z "${VERBOSE}" || echo "using system-wide depend, continuing in $(CURRENT_DIR)" #endif /* UseInstalled */ #endif /* DependDependency */ @@ -2069,7 +2069,7 @@ target:: ProgramTargetName($(IMAKE)) @@\ NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf) @@\ @@\ ProgramTargetName($(IMAKE)) $(IMAKE).Osuf: @@\ - echo "using system-wide imake, continuing in $(CURRENT_DIR)" + @test -z "${VERBOSE}" || echo "using system-wide imake, continuing in $(CURRENT_DIR)" #endif /* UseInstalled */ #endif /* ImakeDependency */ diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 4bd18aa4e..22dc19006 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1500,7 +1500,7 @@ install:: deps @@\ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.html \ @@\ $(DESTDIR)$(DOCHTMLDIR)); \ @@\ for i in name*.png; do \ @@\ - if [ -f $$i ]; then (test -n "${VERBOSE}" && test -n "${VERBOSE}" && set -x; \ @@\ + if [ -f $$i ]; then (test -n "${VERBOSE}" && set -x; \ @@\ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $$i \ @@\ $(DESTDIR)$(DOCHTMLDIR)); \ @@\ fi; \ @@\ diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index fc60671ec..928a4cd5a 100644 --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -136,7 +136,8 @@ install:: Concat(lib,libname.so.rev) @@\ install:: Concat(lib,libname.so) @@\ MakeDir($(DESTDIR)dest) @@\ @set +e; SetRevisions(rev); \ @@\ - test -n "${VERBOSE}" && set -xe; \ @@\ + set -e; \ @@\ + test -n "${VERBOSE}" && set -x; \ @@\ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\ $(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\ $(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\ @@ -207,7 +208,8 @@ Concat(lib,libname.so): solist $(EXTRALIBRARYDEPS) @@\ @@\ clean:: @@\ @set +e; SetRevisions(rev); \ @@\ - test -n "${VERBOSE}" && set -xe; \ @@\ + set -e; \ @@\ + test -n "${VERBOSE}" && set -xe; \ @@\ $(RM) Concat(lib,libname.so.$$MAJ); \ @@\ $(RM) Concat(lib,libname.so.$$MAJ.$$MIN) @@\ $(RM) Concat(lib,libname.so) diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index c0b753a88..e2207b68e 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -199,15 +199,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString #endif /* - * When this is set, modules are always built separately from the libraries - * that statically link into an Xserver. This is for platforms where the - * module and native object formats are different (e.g., OS/2). - */ -#ifndef BuildModuleInSubdir -#define BuildModuleInSubdir NO -#endif - -/* * Default settings for which X Servers to build. */ |