anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compile all minizip sources also on *nix platforms, as platform

Browse Source 
specific code is #ifdef'd out.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19782 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2007-08-24 18:02:14 +00:00
parent 2a2a5e13dd
commit 9e8f0b9d91
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/lyxinclude.m4
View File

@ -580,7 +580,6 @@ AC_ARG_WITH(packaging,
esac]) esac])
AC_MSG_RESULT($lyx_use_packaging) AC_MSG_RESULT($lyx_use_packaging)
lyx_install_macosx=false lyx_install_macosx=false
lyx_install_windows=false
case $lyx_use_packaging in case $lyx_use_packaging in
macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout]) macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
PACKAGE=LyX${version_suffix} PACKAGE=LyX${version_suffix}
@ -598,8 +597,7 @@ case $lyx_use_packaging in
libdir='${prefix}/Resources' libdir='${prefix}/Resources'
datadir='${prefix}/Resources' datadir='${prefix}/Resources'
pkgdatadir='${datadir}' pkgdatadir='${datadir}'
mandir='${prefix}/Resources/man' mandir='${prefix}/Resources/man' ;;
lyx_install_windows=true ;;
posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout]) posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
PACKAGE=lyx${version_suffix} PACKAGE=lyx${version_suffix}
program_suffix=$version_suffix program_suffix=$version_suffix
@ -608,7 +606,6 @@ case $lyx_use_packaging in
*) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;; *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
esac esac
AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx) AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows)
AC_SUBST(pkgdatadir) AC_SUBST(pkgdatadir)
AC_SUBST(program_suffix) AC_SUBST(program_suffix)
]) ])

8
src/support/Makefile.am
View File

@ -96,17 +96,13 @@ liblyxsupport_la_SOURCES = \
minizip/crypt.h \ minizip/crypt.h \
minizip/ioapi.c \ minizip/ioapi.c \
minizip/ioapi.h \ minizip/ioapi.h \
minizip/iowin32.c \
minizip/iowin32.h \
minizip/unzip.c \ minizip/unzip.c \
minizip/unzip.h \ minizip/unzip.h \
minizip/zip.c \ minizip/zip.c \
minizip/zip.h minizip/zip.h
if INSTALL_WINDOWS
liblyxsupport_la_SOURCES += \
minizip/iowin32.c \
minizip/iowin32.h
endif
Package.cpp: build_package Package.cpp: build_package
# Solaris sed does not like spaces bewteen the ;-delimited commands # Solaris sed does not like spaces bewteen the ;-delimited commands