Ticket #28205: scite-makefile.diff

File scite-makefile.diff, 2.4 KB (added by evanj@…, 14 years ago)

patch for the makefiles to make the magic work

  • ../../scintilla/gtk/makefile 

    diff -urN ../../scintilla/gtk/makefile.orig ./../scintilla/gtk/makefile
    old new  
    3030
    3131INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
    3232#~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
    33 CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
     33CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -D__unix__ -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
    3434
    3535ifdef NOTHREADS
    3636THREADFLAGS=-DG_THREADS_IMPL_NONE

  • makefile 

    diff -urN scite/gtk/makefile.orig scite/gtk/makefile
    old new  
    4242
    4343INCLUDEDIRS=-I ../../scintilla/include -I ../src
    4444#~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
    45 CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
     45CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -D__unix__ -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
    4646
    4747ifdef DEBUG
    4848CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
    … …  
    9090FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
    9191PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
    9292        JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
    93         $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
     93        $(CC) `$(CONFIGTHREADS)` -rdynamic -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
    9494
    9595# Automatically generate header dependencies with "make deps"
    9696include deps.mak
    … …  
    109109        done
    110110
    111111ifdef gnomeprefix
    112         $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
    113         $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
     112        $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/application
     113        $(INSTALL) -m 644 SciTE.desktop $(DESTDIR)$(datadir)/applications
     114        $(INSTALL) -m 644 -d $(DESTDIR)$(pixmapdir)
     115        $(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
    114116endif
    115117
    116118uninstall: