Remove LANGUAGEDIR definition.

The language files are installed into [prefix]/share/qucs/lang regardless of the definition of LANGUAGEDIR.
Qucs · Apr 8, 2016 · aac603b · aac603b
1 parent 82a0459
commit aac603b
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 42 deletions.
diff --git a/qucs/config.h.cmake b/qucs/config.h.cmake
@@ -1,4 +1,3 @@
-#cmakedefine LANGUAGEDIR "@LANGUAGEDIR@"
 
 #define PACKAGE_VERSION "@PROJECT_VERSION@"
 #define PACKAGE_STRING "qucs @PROJECT_VERSION@"

diff --git a/qucs/configure.ac b/qucs/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 <config.h>.
 AH_TOP([
 /* __BEGIN_DECLS should be used at the beginning of your declarations,

diff --git a/qucs/qucs-activefilter/CMakeLists.txt b/qucs/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/qucs-attenuator/CMakeLists.txt b/qucs/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/qucs-edit/CMakeLists.txt b/qucs/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/qucs-filter-v2/CMakeLists.txt b/qucs/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/qucs-filter/CMakeLists.txt b/qucs/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/qucs-help/CMakeLists.txt b/qucs/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/qucs-lib/CMakeLists.txt b/qucs/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/qucs-rescodes/CMakeLists.txt b/qucs/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/qucs-transcalc/CMakeLists.txt b/qucs/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/qucs/CMakeLists.txt b/qucs/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/qucs/translations/CMakeLists.txt b/qucs/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)