diff options
| author | Peter Jentsch <pjotr@guineapics.de> | 2012-09-08 22:26:50 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-10 07:56:42 +0200 |
| commit | 1c467763f4ca4bc1caaa3111f0ed85f388e6fe01 (patch) | |
| tree | 66bd1ea66f272ee02315a01bf41f6f5358c55259 /libxslt | |
| parent | eadb83f281b596e441a82798660f1a27c177b2c6 (diff) | |
build and deliver internal libexslt. Use LIBEXSLT_LIBS is system xslt is used
Change-Id: I7ab624bc4877af51d4182ab213ef49cd8c5bb2a4
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/libxsltversion.mk | 3 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 1 | ||||
| -rw-r--r-- | libxslt/prj/d.lst | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk index c80c0e9535b0..e7fe5e5af7c3 100644 --- a/libxslt/libxsltversion.mk +++ b/libxslt/libxsltversion.mk @@ -26,8 +26,11 @@ #************************************************************************* # major LIBXSLT_MAJOR=1 +LIBEXSLT_MAJOR=0 # minor LIBXSLT_MINOR=1 +LIBEXSLT_MINOR=8 # micro LIBXSLT_MICRO=26 +LIBEXSLT_MICRO=15 diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 670ebb952219..9d4deffec4ac 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -159,6 +159,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ENDIF OUT2INC=libxslt$/*.h +OUT2INC+=libexslt$/*.h .IF "$(OS)"=="MACOSX" OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index f3613b0c0d57..892df7b3b1a8 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst @@ -1,5 +1,7 @@ mkdir: %_DEST%\inc\external\libxslt +mkdir: %_DEST%\inc\external\libexslt ..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h +..\%__SRC%\inc\exslt*.h %_DEST%\inc\external\libexslt\*.h ..\%__SRC%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.1.dylib symlink: %_DEST%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.dylib ...\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so |