From 8d4aceb0c2f632b65fb38a7a3c1d783f62cfdc58 Mon Sep 17 00:00:00 2001
From: speedie <speedie@duck.com>
Date: Thu, 9 Mar 2023 15:09:04 +0100
Subject: [PATCH] fix even more small issues such as duplicate lines and broken
 makefile

---
 Makefile   |  3 ++-
 host.mk    | 26 +++++++++++++-------------
 options.mk |  6 +-----
 toggle.mk  |  4 ++--
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 3822394..15df69c 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,8 @@ compat:
 	ln -s $(DESTDIR)$(PREFIX)/bin/spmenu_run $(DESTDIR)$(PREFIX)/bin/dmenu_run
 
 uninstall:
-		  $(DESTDIR)$(PREFIX)/bin/spmenu*\
+		rm -f \
+		  $(DESTDIR)$(PREFIX)/bin/spmenu*
 
 help:
 	@echo install: Installs spmenu. You may need to run this as root.
diff --git a/host.mk b/host.mk
index dfd27dc..a59245c 100644
--- a/host.mk
+++ b/host.mk
@@ -1,43 +1,43 @@
-# spmenu
+# spmenu - dynamic menu
 # See LICENSE file for copyright details.
 
 # compiler
-CC = tcc
+CC           = tcc
 
 # paths
-PREFIX = /usr
+PREFIX       = /usr
 MANPREFIX 	 = ${PREFIX}/share/man
 
 # library paths
 #
 # libx11
-X11LIBS = -lX11
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
+X11LIBS      = -lX11
+X11INC       = /usr/X11R6/include
+X11LIB       = /usr/X11R6/lib
 
 # freetype
 FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
+FREETYPEINC  = /usr/include/freetype2
 
 # xft
-XFTCONF = xft
+XFTCONF      = xft
 
 # xrender
-XRENDERLIBS = -lXrender
+XRENDERLIBS  = -lXrender
 
 # imlib2
-IMLIB2LIBS  = -lImlib2
+IMLIB2LIBS   = -lImlib2
 
 # openssl
-OPENSSLCONF = openssl
+OPENSSLCONF  = openssl
 
 # OpenBSD (uncomment)
 #FREETYPEINC = $(X11INC)/freetype2
 
 # macOS with XQuartz (uncomment)
 #FREETYPEINC = /usr/local/include/freetype2
-#X11INC = /opt/X11/include
-#X11LIB = /opt/X11/lib
+#X11INC      = /opt/X11/include
+#X11LIB      = /opt/X11/lib
 
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMATOGGLE) $(BDTOGGLE) $(PANGOTOGGLE) $(IMLIB2TOGGLE)
 CFLAGS   = -std=c99 -pedantic -Wall -O2 $(INCS) $(CPPFLAGS)
diff --git a/options.mk b/options.mk
index 5406f26..9bcf2ba 100644
--- a/options.mk
+++ b/options.mk
@@ -1,9 +1,5 @@
-# spmenu
+# spmenu - dynamic menu
 # See LICENSE file for copyright details.
 
 # spmenu version
 VERSION = 0.2.2
-
-# includes and libs
-INCS = -I$(X11INC) -I$(FREETYPEINC) $(BDINC) `pkg-config --cflags xft $(PANGOCONF) $(PANGOXFTCONF)`
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) $(IMLIB2LIBS) $(BDLIBS) -lm `pkg-config --libs xft $(PANGOCONF) $(PANGOXFTCONF)`
diff --git a/toggle.mk b/toggle.mk
index e82020b..4cbf939 100644
--- a/toggle.mk
+++ b/toggle.mk
@@ -1,4 +1,4 @@
-# spmenu
+# spmenu - dynamic menu
 # See LICENSE file for copyright details.
 
 # Multi-monitor support.
@@ -11,7 +11,7 @@ XINERAMATOGGLE = -DXINERAMA
 # Comment these lines if you don't need it.
 BDLIBS         = -lfribidi
 BDINC          = /usr/include/fribidi
-BDTOGGLE 	   = -DFRIBIDI
+BDTOGGLE 	   = -DRTL
 
 # Pango
 # Comment these lines if you don't need it.