Mercurial > mxe-octave

changeset 7139:2f9d66cb522c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/gnuplot: Change indentation for readability.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 29 Mar 2024 12:22:59 +0100
parents de3cb80af4cc
children 414e3f556594
files src/gnuplot.mk
diffstat 1 files changed, 34 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/src/gnuplot.mk	Thu Mar 28 20:28:11 2024 +0100
+++ b/src/gnuplot.mk	Fri Mar 29 12:22:59 2024 +0100
@@ -40,7 +40,7 @@
 endef
 
 ifeq ($(MXE_SYSTEM),mingw)
-define $(PKG)_BUILD
+  define $(PKG)_BUILD
     make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) $($(PKG)_STDVER)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=gnuplot.exe gnuplot.exe
     make -C '$(1)/config/mingw' $($(PKG)_EXTRAFLAGS) CC='$(MXE_CC)' CXX='$(MXE_CXX) $($(PKG)_STDVER)' RC='$(MXE_WINDRES)' -j '$(JOBS)' TARGET=wgnuplot.exe wgnuplot.exe
 
@@ -93,43 +93,43 @@
     $(INSTALL) -m755 '$(1)/config/mingw/gnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
     $(INSTALL) -m755 '$(1)/config/mingw/wgnuplot.exe' '$(TOP_DIR)/gnuplot/bin/'
     $(INSTALL) -m644 '$(1)/src/win/wgnuplot.mnu' '$(TOP_DIR)/gnuplot/bin/'
-endef
+  endef
 else
-ifeq ($(MXE_SYSTEM),msvc)
-define $(PKG)_BUILD
-    $(INSTALL) -d '$(3)$(HOST_PREFIX)'
-    cd '$(1)/config/msvc' && \
+  ifeq ($(MXE_SYSTEM),msvc)
+    define $(PKG)_BUILD
+      $(INSTALL) -d '$(3)$(HOST_PREFIX)'
+      cd '$(1)/config/msvc' && \
         env -u MAKE -u MAKEFLAGS nmake DESTDIR=$(shell (cd '$(HOST_PREFIX)' && pwd -W) | sed -e 's#/#\\\\#g') && \
         env -u MAKE -u MAKEFLAGS nmake DESTDIR=$(shell (cd '$(3)$(HOST_PREFIX)' && pwd -W) | sed -e 's#/#\\\\#g') install
-endef
+    endef
+
+  else
 
-else
+    ## If we allow the system Qt libraries to be used, then these
+    ## won't make sense.
+    $(PKG)_QT_CONFIGURE_OPTIONS := \
+      MOC=$(MXE_MOC) \
+      UIC=$(MXE_UIC) \
+      RCC=$(MXE_RCC) \
+      LRELEASE=$(MXE_LRELEASE)
 
-## If we allow the system Qt libraries to be used, then these
-## won't make sense.
-$(PKG)_QT_CONFIGURE_OPTIONS := \
-  MOC=$(MXE_MOC) \
-  UIC=$(MXE_UIC) \
-  RCC=$(MXE_RCC) \
-  LRELEASE=$(MXE_LRELEASE)
+    ifeq ($(ENABLE_QT),5)
+      $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
+      $(PKG)_QT_CONFIGURE_OPTIONS += --with-qt=qt5
+    endif
+    ifeq ($(ENABLE_QT),6)
+      $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt6/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
+      $(PKG)_QT_CONFIGURE_OPTIONS += --with-qt=qt6
+    endif
 
-ifeq ($(ENABLE_QT),5)
-  $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
-  $(PKG)_QT_CONFIGURE_OPTIONS += --with-qt=qt5
+    define $(PKG)_BUILD
+      cd '$(1)' && autoreconf -fi && PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
+      ./configure \
+        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) LIBS=-liconv \
+        --without-lua \
+        $($(PKG)_QT_CONFIGURE_OPTIONS) \
+        --prefix='$(HOST_PREFIX)'
+      make -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
+    endef
+  endif
 endif
-ifeq ($(ENABLE_QT),6)
-  $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt6/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
-  $(PKG)_QT_CONFIGURE_OPTIONS += --with-qt=qt6
-endif
-
-define $(PKG)_BUILD
-    cd '$(1)' && autoreconf -fi && PKG_CONFIG_PATH=$($(PKG)_PKG_CONFIG_PATH) \
-    ./configure \
-      $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) LIBS=-liconv \
-      --without-lua \
-      $($(PKG)_QT_CONFIGURE_OPTIONS) \
-      --prefix='$(HOST_PREFIX)'
-    make -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
-endef
-endif
-endif