diff --git a/config.h.cmake b/config.h.cmake index 866a2690..cab35aeb 100755 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,4 +1,3 @@ -#cmakedefine LANGUAGEDIR "@LANGUAGEDIR@" #define PACKAGE_VERSION "@PROJECT_VERSION@" #define PACKAGE_STRING "qucs @PROJECT_VERSION@" diff --git a/configure.ac b/configure.ac index fca69cbe..3f6c8265 100644 --- a/configure.ac +++ b/configure.ac @@ -764,12 +764,6 @@ mingw* | *msys* | cygwin*) esac AC_SUBST(PATHXFORM) -dnl Create path info. -LANG_PATH="$prefix/share/qucs/lang/" -AC_DEFINE_UNQUOTED([LANGUAGEDIR], ["$LANG_PATH"], - [Where the language files go.]) -unset LANG_PATH - dnl Definitions at top of . AH_TOP([ /* __BEGIN_DECLS should be used at the beginning of your declarations, diff --git a/qucs-activefilter/CMakeLists.txt b/qucs-activefilter/CMakeLists.txt index 913cb9ec..12a06494 100644 --- a/qucs-activefilter/CMakeLists.txt +++ b/qucs-activefilter/CMakeLists.txt @@ -25,9 +25,6 @@ IF(NOT WIN32) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register ") ENDIF() -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - #configure the header config.h CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/../config.h.cmake" diff --git a/qucs-attenuator/CMakeLists.txt b/qucs-attenuator/CMakeLists.txt index 49b56bee..3466ebac 100644 --- a/qucs-attenuator/CMakeLists.txt +++ b/qucs-attenuator/CMakeLists.txt @@ -17,9 +17,6 @@ SET(CMAKE_BUILD_TYPE Debug) ADD_DEFINITIONS( -DHAVE_CONFIG_H ) -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - # configure the header config.h CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/../config.h.cmake" diff --git a/qucs-edit/CMakeLists.txt b/qucs-edit/CMakeLists.txt index b5bdddcb..4d24714d 100644 --- a/qucs-edit/CMakeLists.txt +++ b/qucs-edit/CMakeLists.txt @@ -17,9 +17,6 @@ SET(CMAKE_BUILD_TYPE Debug) ADD_DEFINITIONS( -DHAVE_CONFIG_H ) -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - # configure the header config.h CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/../config.h.cmake" diff --git a/qucs-filter-v2/CMakeLists.txt b/qucs-filter-v2/CMakeLists.txt index efdb4414..9f90cb4b 100644 --- a/qucs-filter-v2/CMakeLists.txt +++ b/qucs-filter-v2/CMakeLists.txt @@ -2,8 +2,6 @@ PROJECT(qucsfilter-v2 CXX C) CMAKE_MINIMUM_REQUIRED(VERSION 2.6) cmake_policy(VERSION 2.6) -SET(LANGUAGEDIR TRUE) - SET(CMAKE_BUILD_TYPE Debug) # The incomplete filter-v2 only builds withs -stdlib=libstc++ diff --git a/qucs-filter/CMakeLists.txt b/qucs-filter/CMakeLists.txt index d8fe16ca..c725fcc5 100644 --- a/qucs-filter/CMakeLists.txt +++ b/qucs-filter/CMakeLists.txt @@ -17,9 +17,6 @@ SET(CMAKE_BUILD_TYPE Debug) ADD_DEFINITIONS( -DHAVE_CONFIG_H ) -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - # configure the header config.h CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/../config.h.cmake" diff --git a/qucs-help/CMakeLists.txt b/qucs-help/CMakeLists.txt index cf6fcca7..92fc5292 100644 --- a/qucs-help/CMakeLists.txt +++ b/qucs-help/CMakeLists.txt @@ -17,9 +17,6 @@ SET(CMAKE_BUILD_TYPE Debug) ADD_DEFINITIONS( -DHAVE_CONFIG_H ) -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - # configure the header config.h CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/../config.h.cmake" diff --git a/qucs-lib/CMakeLists.txt b/qucs-lib/CMakeLists.txt index 49615739..98101feb 100644 --- a/qucs-lib/CMakeLists.txt +++ b/qucs-lib/CMakeLists.txt @@ -17,9 +17,6 @@ SET(CMAKE_BUILD_TYPE Debug) ADD_DEFINITIONS( -DHAVE_CONFIG_H ) -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - # configure the header config.h CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/../config.h.cmake" diff --git a/qucs-rescodes/CMakeLists.txt b/qucs-rescodes/CMakeLists.txt index c508590e..e62d21f3 100644 --- a/qucs-rescodes/CMakeLists.txt +++ b/qucs-rescodes/CMakeLists.txt @@ -17,9 +17,6 @@ SET(CMAKE_BUILD_TYPE Debug) ADD_DEFINITIONS( -DHAVE_CONFIG_H ) -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - # configure the header config.h CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/../config.h.cmake" diff --git a/qucs-transcalc/CMakeLists.txt b/qucs-transcalc/CMakeLists.txt index c3060771..b3410c94 100644 --- a/qucs-transcalc/CMakeLists.txt +++ b/qucs-transcalc/CMakeLists.txt @@ -17,9 +17,6 @@ SET(CMAKE_BUILD_TYPE Debug) ADD_DEFINITIONS( -DHAVE_CONFIG_H ) -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - # configure the header config.h CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/../config.h.cmake" diff --git a/qucs/CMakeLists.txt b/qucs/CMakeLists.txt index 2bb0e859..58cb5fec 100755 --- a/qucs/CMakeLists.txt +++ b/qucs/CMakeLists.txt @@ -54,10 +54,6 @@ endif() # ADD_DEFINITIONS( -DHAVE_CONFIG_H ) -# define variables -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - - FIND_PACKAGE( Qt4 4.6.3 REQUIRED QtCore QtGui Qt3Support QtSvg QtXml QtScript) INCLUDE( ${QT_USE_FILE} ) diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt index 6be103eb..3c5396e5 100644 --- a/translations/CMakeLists.txt +++ b/translations/CMakeLists.txt @@ -31,13 +31,9 @@ ENDIF (UPDATE_TRANSLATIONS) # #FILE(GLOB QtTRANSLATIONS qtgeneric_*.ts) -# -# location for translations -SET(LANGUAGEDIR "${CMAKE_INSTALL_PREFIX}/share/qucs/lang/") - # # install tranlations -INSTALL( FILES ${QM_FILES} DESTINATION ${LANGUAGEDIR}) +INSTALL( FILES ${QM_FILES} DESTINATION share/qucs/lang) # prevent the generated files from being deleted during make clean #set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM true)