From: Dariusz Dwornikowski <dariusz.dwornikowski@cs.put.poznan.pl>
Date: Mon, 26 Oct 2020 13:41:42 +0000
Subject: makefile tweaks

Get the Makefile to pass along compilation options the Debian build
scripts want it to.
---
 Makefile    | 46 +++++++++++++++++++++++-----------------------
 configure   | 11 +----------
 po/Makefile |  8 ++++----
 3 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/Makefile b/Makefile
index 32fd887..adfd40e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@
 
 PROGNAME = linux_logo
 
-#ifeq ($(OS),IRIX64) 
+CCFLAGS = $(CFLAGS) $(LDFLAGS) $(CPPFLAGS)
+#ifeq ($(OS),IRIX64)
 #   LDFLAGS += -lintl
 #endif
 
@@ -17,9 +18,9 @@ endif
 #
 # Installation location
 #
-INSTALL_BINPATH = $(DESTDIR)$(PREFIX)/bin
-INSTALL_MANPATH = $(DESTDIR)$(PREFIX)/share/man
-INSTALL_DOCPATH = $(DESTDIR)$(PREFIX)/share/doc
+BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/share/man
+DOCDIR = $(PREFIX)/share/doc
 
 #
 # Libsysinfo location
@@ -33,13 +34,13 @@ endif
 
 all:	Makefile.default parse_logos linux_logo $(TRANSLATIONS)
 
-Makefile.default:	 
+Makefile.default:
 	ifneq($(CONFIGURE_RAN),1)
 	$(error Please run configure first)
 	endif
 
 translations:
-	cd po && $(MAKE)
+	$(MAKE) -C po
 
 logos-all:	logo_config
 	find ./logos -type f -a ! -name banner.logo -a ! -name classic.logo | sort >> logo_config
@@ -53,55 +54,54 @@ clean:	Makefile.default
 	rm -f *.o
 	rm -f linux_logo linux_logo-dyn parse_logos load_logos.h
 	rm -f *~
-	cd $(LIBSYSINFO) && $(MAKE) clean
-	cd po && $(MAKE) clean
+	$(MAKE) -C $(LIBSYSINFO) clean
+	$(MAKE) -C po clean
 
 distclean: clean
-	cd $(LIBSYSINFO) && $(MAKE) distclean
+	$(MAKE) -C $(LIBSYSINFO) distclean
 	rm -f Makefile.default logo_config
 #	rm -f po/linux_logo.pot
 
 linux_logo:	linux_logo.o load_logo.o ./$(LIBSYSINFO)/libsysinfo.a
-	$(CROSS)$(CC) $(LDFLAGS) -o linux_logo linux_logo.o load_logo.o $(LIBSYSINFO_LIBRARY) ./$(LIBSYSINFO)/libsysinfo.a 
+	$(CROSS)$(CC) $(CCFLAGS) -o linux_logo linux_logo.o load_logo.o $(LIBSYSINFO_LIBRARY) ./$(LIBSYSINFO)/libsysinfo.a
 
 linux_logo_shared:	linux_logo.o load_logo.o ./$(LIBSYSINFO)/libsysinfo.a
-	$(CROSS)$(CC) $(CFLAGS) -o linux_logo-dyn linux_logo.o load_logo.o $(LIBSYSINFO_LIBRARY) -lsysinfo
+	$(CROSS)$(CC) $(CCFLAGS) -o linux_logo-dyn linux_logo.o load_logo.o $(LIBSYSINFO_LIBRARY) -lsysinfo
 
 
 ./$(LIBSYSINFO)/libsysinfo.a:
-	cd $(LIBSYSINFO) && $(MAKE)
+	$(MAKE) -C $(LIBSYSINFO)
 
 parse_logos:	parse_logos.o load_logo_native.o
-	$(CC) $(LDFLAGS) -o parse_logos parse_logos.o load_logo_native.o
+	$(CC) $(CCFLAGS) -o parse_logos parse_logos.o load_logo_native.o
 
 parse_logos.o:	parse_logos.c logo_config
-	$(CC) $(CFLAGS) $(LIBSYSINFO_INCLUDE) -c parse_logos.c
+	$(CC) $(CCFLAGS) $(LIBSYSINFO_INCLUDE) -c parse_logos.c
 
 load_logos.h:	logo_config parse_logos
 	./parse_logos
 
 load_logo.o:	load_logo.c
-	$(CROSS)$(CC) $(CFLAGS) $(LIBSYSINFO_INCLUDE) -c load_logo.c
+	$(CROSS)$(CC) $(CCFLAGS) $(LIBSYSINFO_INCLUDE) -c load_logo.c
 
 load_logo_native.o:	load_logo.c
-	$(CC) $(CFLAGS) $(LIBSYSINFO_INCLUDE) -o load_logo_native.o -c load_logo.c	
+	$(CC) $(CCFLAGS) $(LIBSYSINFO_INCLUDE) -o load_logo_native.o -c load_logo.c
 
 linux_logo.o:	linux_logo.c defaults.h load_logos.h
 	@echo Compiling for $(OS)
 	@echo Edit defaults.h to change Default Values
-	$(CROSS)$(CC) $(CFLAGS) $(LIBSYSINFO_INCLUDE) \
+	$(CROSS)$(CC) $(CCFLAGS) $(LIBSYSINFO_INCLUDE) \
 		      -DLOCALE_DIR=\"$(PREFIX)/share/locale\" -DUSE_I18N=$(USE_I18N) \
 		      -c linux_logo.c
 
 install:	linux_logo
-	$(INSTALL) -c -m755 $(PROGNAME) -D $(INSTALL_BINPATH)/$(PROGNAME)
-	$(INSTALL) -c -D -m644 $(PROGNAME).1.gz $(INSTALL_MANPATH)/man1/$(PROGNAME).1.gz
-	cd po && $(MAKE) install
+	$(INSTALL) -c -m755 $(PROGNAME) -D $(DESTDIR)$(BINDIR)/$(PROGNAME)
+	$(MAKE) -C po install
 
 install-doc:
-	$(INSTALL) -c -d -m 755 $(INSTALL_DOCPATH)/$(PROGNAME)
-	$(INSTALL) -c -p -m 644 *[A-Z] $(INSTALL_DOCPATH)/$(PROGNAME)
+	$(INSTALL) -c -d -m 755 $(DESTDIR)$(DOCDIR)/$(PROGNAME)
+	$(INSTALL) -c -p -m 644 *[A-Z] $(DESTDIR)$(DOCDIR)/$(PROGNAME)
 
 # The old way of installing
 install-by-copying:
-	cp linux_logo $(PREFIX)/bin
+	cp linux_logo $(BINDIR)/
diff --git a/configure b/configure
index 2d30fd2..ed8b752 100755
--- a/configure
+++ b/configure
@@ -58,15 +58,9 @@ fi
 
 LIBSYSINFO=libsysinfo-0.3.0
 
-LDFLAGS=""
 
-if [ $CC = gcc ]; then
-   CFLAGS="-Wall -O2"
-else
-   CFLAGS="-O2"
-fi   
 
-$CROSS$CC $CFLAGS -c intl_test.c 
+$CROSS$CC  -c intl_test.c 
 INTL_MISSING=$?
 
 
@@ -87,16 +81,13 @@ fi
 
 echo "  libsysinfo: "$LIBSYSINFO
 echo "  C Compiler : "$CC
-echo "  CFLAGS     : "$CFLAGS
 
 echo "CC=$CC" > Makefile.default
 echo "ARCH=$ARCH" >> Makefile.default
 echo "OS=$OS" >> Makefile.default
 echo "PREFIX=$PREFIX" >> Makefile.default
 echo "INSTALL=$INSTALL" >> Makefile.default
-echo "CFLAGS=$CFLAGS" >> Makefile.default
 echo "LIBSYSINFO=$LIBSYSINFO" >> Makefile.default
-echo "LDFLAGS=$LDFLAGS" >> Makefile.default
 echo "XGETTEXT=$XGETTEXT" >> Makefile.default
 echo "USE_I18N=$USE_I18N" >> Makefile.default
 echo "CONFIGURE_RAN=1" >> Makefile.default
diff --git a/po/Makefile b/po/Makefile
index ce732f9..ef61d39 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,7 +1,7 @@
 include ../Makefile.default
 
 PACKAGE=linux_logo
-INSTALL_LOCALEPATH=$(PREFIX)/share/locale
+LOCALEDIR=$(PREFIX)/share/locale
 
 CATALOGS = da.mo de.mo es.mo fr.mo nb.mo nl.mo it.mo pl.mo pt_BR.mo ru.mo sv.mo uk.mo zh_TW.mo
 
@@ -23,9 +23,9 @@ clean:
 install: $(CATALOGS)
 	for n in $(CATALOGS); do \
 	l=`basename $$n .mo`; \
-	$(INSTALL) -c -m 755 -d $(INSTALL_LOCALEPATH)/$$l; \
-	$(INSTALL) -c -m 755 -d $(INSTALL_LOCALEPATH)/$$l/LC_MESSAGES; \
-	$(INSTALL) -c -m 644 $$n $(INSTALL_LOCALEPATH)/$$l/LC_MESSAGES/$(PACKAGE).mo; \
+	$(INSTALL) -c -m 755 -d $(DESTDIR)$(LOCALEDIR)/$$l; \
+	$(INSTALL) -c -m 755 -d $(DESTDIR)$(LOCALEDIR)/$$l/LC_MESSAGES; \
+	$(INSTALL) -c -m 644 $$n $(DESTDIR)$(LOCALEDIR)/$$l/LC_MESSAGES/$(PACKAGE).mo; \
 	done
 
 %.mo: %.po