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

Adjust cpp location for FreeBSD

Browse Source 
cpp was removed from /usr/libexec with FreeBSD 5.0-RELEASE.
Use __FreeBSD_version to tell imake if it's still there.

While here, X.Y.Z versioning ended with FreeBSD 3.0, so
we must be dealing with 2.Y.Z when checking for -lgnumalloc.
This commit is contained in:
Marcin Cieslak
2012-08-13 00:37:42 +02:00
committed by Jon Trulson
parent fa3ad160e4
commit 851330b5f5
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cde/config/cf/FreeBSD.cf
View File

@@ -21,8 +21,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasBSD44Sockets YES
#define HasZlib YES
#if OSMajorVersion >= 5
#define CppCmd /usr/bin/cpp -traditional
#define PreProcessCmd /usr/bin/cpp -traditional
#else
#define CppCmd /usr/libexec/cpp -traditional
#define PreProcessCmd /usr/libexec/cpp -traditional
#endif
#undef InstallCmd
#define InstallCmd /usr/bin/install
@@ -58,6 +63,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasMakefileSafeInclude YES
#define IncludeMakefile(file) @@# dependencies are in .depend
#define DependFileName .depend
#if OSMajorVersion < 3
#if OSMinorVersion < 2
#ifndef ExtraLibraries
#define ExtraLibraries -lgnumalloc
@@ -66,6 +72,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#if OSTeenyVersion == 2
#define HasSetUserContext YES
#endif
#endif
#ifndef ExtraLoadFlags
/*
* This doesn't work the way it does on every other system. On FreeBSD it's