diff --git a/CMakeLists.txt b/CMakeLists.txt index 7971fdb..dbf39ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,10 @@ configure_file( "${CMAKE_SOURCE_DIR}/pathnames.h.in" "${CMAKE_BINARY_DIR}/pathnames.h" ) +configure_file( + "${CMAKE_SOURCE_DIR}/Paths.h.in" + "${CMAKE_BINARY_DIR}/Paths.h" +) include_directories("${CMAKE_BINARY_DIR}") diff --git a/include/Paths.h.in b/Paths.h.in similarity index 68% rename from include/Paths.h.in rename to Paths.h.in index 1d720ea..20ac2de 100644 --- a/include/Paths.h.in +++ b/Paths.h.in @@ -29,17 +29,29 @@ * from Sony Corporation. */ +#ifndef SJ3_PATHS_H_ +#define SJ3_PATHS_H_ -#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) -#define ErrorOutFile "/dev/console" +#include "paths.h" + +#ifdef NDEBUG +#define ErrorOutFile _PATH_DEVNULL #else -/* #define ErrorOutFile "/dev/stderr" */ /* for test */ -#define ErrorOutFile "/dev/null" +#define ErrorOutFile _PATH_CONSOLE #endif -#define SocketName "/tmp/sj3sock" -#define LockFile "/tmp/SJ3SERV.EXIST" +#define SocketName _PATH_VARRUN "sj3serv.sock" +#define LockFile _PATH_VARRUN "sj3serv.lock" -#define MainDictionary "sj3main.dic" -#define UserDictionary "private.dic" -#define StudyFile "study.dat" +#define MainDictionary "sj3main.dic" +#define UserDictionary "private.dic" +#define StudyFile "study.dat" + +#define RunCmdFile "@CMAKE_INSTALL_FULL_SYSCONFDIR@/sj3serv.conf" +#define DictRootDir "@CMAKE_INSTALL_FULL_DATADIR@/sj3/dict" + +#define DEFRKFILE "@CMAKE_INSTALL_FULL_DATADIR@/sj3/sjrk" +#define DEFRCFILE "@CMAKE_INSTALL_FULL_DATADIR@/sj3/sjrc" +#define DEFKEYFILE "@CMAKE_INSTALL_FULL_DATADIR@/sj3/cvtkey." + +#endif /* SJ3_PATHS_H_ */ diff --git a/include/Paths.h b/include/Paths.h deleted file mode 100644 index 0cdacd5..0000000 --- a/include/Paths.h +++ /dev/null @@ -1,52 +0,0 @@ -/*- - * SPDX-License-Identifier: MIT-open-group - * - * Copyright (c) 1997 Sony Corporation - * Copyright (c) 1996 Hidekazu Kuroki - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of Sony Corporation - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * from Sony Corporation. - */ - - - -#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) -#define ErrorOutFile "/dev/console" -#else -#define ErrorOutFile "/dev/stderr" -/*#define ErrorOutFile "/dev/null"*/ -#endif - -#define SocketName "/tmp/sj3sock" -#define LockFile "/tmp/SJ3SERV.EXIST" - -#define MainDictionary "sj3main.dic" -#define UserDictionary "private.dic" -#define StudyFile "study.dat" -#define RunCmdFile "/usr/local/lib/sj3/serverrc" -#define DictRootDir "/usr/local/share/sj3/dict" - -#define DEFRKFILE "/usr/local/lib/sj3/sjrk" -#define DEFRCFILE "/usr/local/lib/sj3/sjrc" -#define DEFKEYFILE "/usr/local/lib/sj3/cvtkey."