CTAN sync 202009200303

1 files changed, 19 insertions, 29 deletions

diff --git a/support/dktools/dk4fd.h b/support/dktools/dk4fd.h
index 8706d7de3e..6c29a3673b 100644
--- a/support/dktools/dk4fd.h
+++ b/support/dktools/dk4fd.h
@@ -1,36 +1,14 @@
 /*
-	WARNING: This file was generated by dkct.
-	Changes you make here will be lost if dkct is run again!
-	You should modify the original source and run dkct on it.
-	Original source: dk4fd.ctr
+Copyright (C) 2015-2020, Dirk Krause
+SPDX-License-Identifier: BSD-3-Clause
 */
 
 /*
-Copyright (C) 2015-2017, Dirk Krause
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above opyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-* Neither the name of the author nor the names of contributors may be used
-  to endorse or promote products derived from this software without specific
-  prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	WARNING: This file was generated by the dkct program (see
+	http://dktools.sourceforge.net/ for details).
+	Changes you make here will be lost if dkct is run again!
+	You should modify the original source and run dkct on it.
+	Original source: dk4fd.ctr
 */
 
 #ifndef DK4FD_H_INCLUDED
@@ -49,15 +27,27 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef DK4CONF_H_INCLUDED
+#if DK4_BUILDING_DKTOOLS4
 #include "dk4conf.h"
+#else
+#include <dktools-4/dk4conf.h>
+#endif
 #endif
 
 #ifndef DK4TYPES_H_INCLUDED
+#if DK4_BUILDING_DKTOOLS4
 #include "dk4types.h"
+#else
+#include <dktools-4/dk4types.h>
+#endif
 #endif
 
 #ifndef DK4ERROR_H_INCLUDED
+#if DK4_BUILDING_DKTOOLS4
 #include "dk4error.h"
+#else
+#include <dktools-4/dk4error.h>
+#endif
 #endif
 
 #if DK4_HAVE_SYS_TYPES_H