odk: merge Package_config_notwin into Packge_config

Change-Id: I021ae1bc6d816d359be364c221d70a0e178a8b80

odk/Module_odk.mk

@@ -36,10 +36,6 @@ $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_config_win \
 	Package_config_win \
 ))
-else
-$(eval $(call gb_Module_add_targets,odk,\
-	Package_config_notwin \
-))
 endif
 
 ifneq ($(ENABLE_JAVA),)

odk/Package_config.mk

@@ -7,21 +7,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,odk_config,$(SRCDIR)/odk/config))
+$(eval $(call gb_Package_Package,odk_config,$(SRCDIR)))
 
 $(eval $(call gb_Package_set_outdir,odk_config,$(INSTDIR)))
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\
-	cfgWin.js \
-	setsdkenv_windows.template \
-	setsdkname.bat \
+	odk/config/cfgWin.js \
+	odk/config/setsdkenv_windows.template \
+	odk/config/setsdkname.bat \
 ))
 else
 $(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\
-	configure.pl \
-	setsdkenv_unix \
-	setsdkenv_unix.sh.in \
+	config.guess \
+	config.sub \
+	odk/config/configure.pl \
+	odk/config/setsdkenv_unix \
+	odk/config/setsdkenv_unix.sh.in \
 ))
 endif
 

odk/Package_config_notwin.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,odk_config_notwin,$(SRCDIR)))
-
-$(eval $(call gb_Package_set_outdir,odk_config_notwin,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,odk_config_notwin,$(SDKDIRNAME),\
-	config.guess \
-	config.sub \
-))
-
-# vim: set noet sw=4 ts=4:

scp2/source/sdkoo/sdkoo.scp

@@ -96,13 +96,6 @@ File gid_File_Package_odk_config_win
     Name = "odk_config_win.filelist";
     Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
-#else
-File gid_File_Package_odk_config_notwin
-    TXT_FILE_BODY;
-    Dir = FILELIST_SDK_DIR;
-    Name = "odk_config_notwin.filelist";
-    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
 #endif
 
 File gid_File_Package_odk_docs