--- Makefile.orig	2009-03-07 21:27:48.000000000 +0100
+++ Makefile	2009-03-07 21:28:43.000000000 +0100
@@ -19,32 +19,6 @@
 
 include config.mak
 
-ifeq ($(CC),gcc)
-  CFLAGS   := -Wall -g -O2 -funsigned-char
-  # do not warn about zero-length formats.
-  CFLAGS   += -Wno-format-zero-length
-  LDFLAGS  := -g
-endif
-
-#include local compiler configuration file
--include cflags.mk
-
-ifdef TARGET_GPROF
-  CFLAGS   += -p
-  LDFLAGS  += -p
-endif
-
-TLDFLAGS := $(LDFLAGS)
-
-ifdef TARGET_ARCH_X86
-  #CFLAGS+=-fomit-frame-pointer
-  ifeq ($(GCC_MAJOR),2)
-    CFLAGS+=-m386 -malign-functions=0
-  else
-    CFLAGS+=-march=i386 -falign-functions=0
-  endif
-endif
-
 DEFINES=-DHAVE_QE_CONFIG_H
 
 ########################################################
@@ -354,16 +328,16 @@
 install: $(TARGETS) qe.1
 	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
 	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/man/man1
-	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/qe
+	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/qemacs
 	$(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
-	ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE)
 ifdef CONFIG_FFMPEG
 	ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE)
 endif
-	$(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe
-	$(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/man1
+	$(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qemacs
+	$(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/man1/qemacs.1
 ifdef CONFIG_HTML
 	$(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
+	$(INSTALL) -m 755 libqhtml/csstoqe $(DESTDIR)$(prefix)/bin/csstoqe
 endif
 
 uninstall: