diff options
| -rw-r--r-- | Library.tmpl | 8 | ||||
| -rw-r--r-- | X11.tmpl | 5 | ||||
| -rw-r--r-- | gnuLib.rules | 4 | ||||
| -rw-r--r-- | lnxLib.rules | 6 |
4 files changed, 15 insertions, 8 deletions
diff --git a/Library.tmpl b/Library.tmpl index f3e4d0d..740ca10 100644 --- a/Library.tmpl +++ b/Library.tmpl @@ -543,14 +543,18 @@ AllTarget($(EXTRAUNSHAREDOBJS)) # endif /* LibCreate */ # ifdef IncSubdir # ifdef IncSubSubdir +# if !defined(LibHeaders) || LibHeaders BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..) -# if BuildLibraries +# if BuildLibraries InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS)) +# endif # endif # else +# if !defined(LibHeaders) || LibHeaders BuildIncludes($(HEADERS),IncSubdir,..) -# if BuildLibraries +# if BuildLibraries InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS)) +# endif # endif # endif # else @@ -554,6 +554,9 @@ VENDORMANVERSION = XVendorManVersionString #define UseFreetype2 (BuildXftLibrary || BuildXft1Library || \ UseFontconfig || BuildFreeType) #endif +#ifndef InstallFontconfigLibrary +# define InstallFontconfigLibrary YES +#endif #ifndef HasExpat #define HasExpat NO #endif @@ -3262,7 +3265,7 @@ ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig #if SharedLibFontconfig #ifndef SharedFontconfigRev -#define SharedFontconfigRev 1.0 +#define SharedFontconfigRev 1.0.4 #endif SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGLIBSRC),SOFONTCONFIGREV,SharedFontconfigRev) #else diff --git a/gnuLib.rules b/gnuLib.rules index 4dca2aa..1004550 100644 --- a/gnuLib.rules +++ b/gnuLib.rules @@ -119,7 +119,7 @@ Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ + @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@ -147,7 +147,7 @@ Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ + @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) diff --git a/lnxLib.rules b/lnxLib.rules index 3035b5e..0cc71d3 100644 --- a/lnxLib.rules +++ b/lnxLib.rules @@ -174,7 +174,7 @@ Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ + @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@ -234,7 +234,7 @@ Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ + @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@ -262,7 +262,7 @@ Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`echo rev | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ + @MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \ @@\ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) |