[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1937-g0bc5d53

The ghostpdl branch, master has been updated
       via  0bc5d53fa1c0d7832008d1ae8e0e6804bf5f9e9e (commit)
       via  efafc6f95b0bfedf63efafc55416846974a67bcc (commit)
      from  0243f6288ca26b2985f0778040feebae7322ac0b (commit)

----------------------------------------------------------------------
commit 0bc5d53fa1c0d7832008d1ae8e0e6804bf5f9e9e
Author: Chris Liddell <[email protected]>
Date:   Fri Nov 22 13:02:39 2019 +0000

    Windows (un)installer: Fix case for registry key removal

diff --git a/psi/nsisinst.nsi b/psi/nsisinst.nsi
index e26d66c..cc6df99 100644
--- a/psi/nsisinst.nsi
+++ b/psi/nsisinst.nsi
@@ -266,7 +266,7 @@ Delete   "$INSTDIR\uninstgs.exe"
 !if "${WINTYPE}" == "64"
     SetRegView 64
 !endif
-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Artifex\GPL Ghostscript\${VERSION}"
+DeleteRegKey HKEY_LOCAL_MACHINE "Software\Artifex\GPL Ghostscript\${VERSION}"
 DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPL Ghostscript ${VERSION}"
 DeleteRegKey HKEY_LOCAL_MACHINE "Software\GPL Ghostscript\${VERSION}"
 RMDir /r "$INSTDIR\doc"

----------------------------------------------------------------------
commit efafc6f95b0bfedf63efafc55416846974a67bcc
Author: Chris Liddell <[email protected]>
Date:   Fri Nov 22 10:30:14 2019 +0000

    "Promote" gpdl from experimental to actual product
    
    Really, add gpdl to the default targets list.

diff --git a/Makefile.in b/Makefile.in
index d5f9972..5b632c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -205,7 +205,7 @@ PCL_TARGET=@PCL_TARGET@
 XPS_TARGET=@XPS_TARGET@
 GPDL_TARGET=@GPDL_TARGET@
 
-PCL_XPS_TARGETS=$(PCL_TARGET) $(XPS_TARGET) @GPDL_TARGET_VAR@
+PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET)
 
 # Define the directories for debugging and profiling binaries, relative to
 # the standard binaries.
diff --git a/base/gs.mak b/base/gs.mak
index f9674d6..a6bc6da 100644
--- a/base/gs.mak
+++ b/base/gs.mak
@@ -269,10 +269,10 @@ gconfigd_h=$(GLGENDIR)$(D)gconfigd.h
 iconfxx_h=$(GLGENDIR)$(D)iconfxx.h
 iconfig_h=$(GLGENDIR)$(D)iconfig.h
 
-all default : $(GS_XE) $(PCL_XPS_TARGETS) $(GS_SHARED_OBJS) $(MAKEDIRSTOP) $(GS_MAK) $(MAKEDIRS)
+all default : $(GS_XE) $(PCL_XPS_PDL_TARGETS) $(GS_SHARED_OBJS) $(MAKEDIRSTOP) $(GS_MAK) $(MAKEDIRS)
 	$(NO_OP)
 
-experimental: all $(GPDL_TARGET)
+experimental: all
 	$(NO_OP)
 
 # the distclean and maintainer-clean targets (if any)
diff --git a/base/unix-gcc.mak b/base/unix-gcc.mak
index 99c2caa..ae85c06 100644
--- a/base/unix-gcc.mak
+++ b/base/unix-gcc.mak
@@ -178,7 +178,7 @@ GPDL=gpdl
 XE=
 XEAUX=
 
-PCL_XPS_TARGETS=
+PCL_XPS_PDL_TARGETS=
 
 # Define the directories for debugging and profiling binaries, relative to
 # the standard binaries.
diff --git a/configure.ac b/configure.ac
index 9f353e5..b4dfe0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2299,14 +2299,6 @@ AC_SUBST(GPDL_TARGET)
 AC_SUBST(GPDL_MAK)
 
 
-AC_ARG_ENABLE([gpdl], AC_HELP_STRING([--enable-gpdl],
-    [Add gpdl to the default make target list]),
-[
-    GPDL_TARGET_VAR="\$(GPDL_TARGET)"
-])
-
-AC_SUBST(GPDL_TARGET_VAR)
-
 dnl do we compile the postscript initialization files into Ghostscript?
 COMPILE_INITS="1"
 AC_ARG_ENABLE([compile-inits], AC_HELP_STRING([--disable-compile-inits],
diff --git a/psi/msvc.mak b/psi/msvc.mak
index 187e09c..5500d43 100644
--- a/psi/msvc.mak
+++ b/psi/msvc.mak
@@ -291,7 +291,7 @@ XPS_TARGET=gxps
 GPDL_TARGET=gpdl
 !endif
 
-PCL_XPS_TARGETS=$(PCL_TARGET) $(XPS_TARGET)
+PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET)
 
 # Define the root directory for Ghostscript installation.
 


Summary of changes:
 Makefile.in       | 2 +-
 base/gs.mak       | 4 ++--
 base/unix-gcc.mak | 2 +-
 configure.ac      | 8 --------
 psi/msvc.mak      | 2 +-
 psi/nsisinst.nsi  | 2 +-
 6 files changed, 6 insertions(+), 14 deletions(-)