Browse Source

Install headers in */ntk/FL to avoid conflicting with installed FLTK version.

tags/v1.3.1000
Jonathan Moore Liles 13 years ago
parent
commit
3b814a6800
2 changed files with 16 additions and 16 deletions
  1. +12
    -12
      FL/Makefile.in
  2. +4
    -4
      ntk-config.in

+ 12
- 12
FL/Makefile.in View File

@@ -35,27 +35,27 @@ depend:

install:
echo "Installing include files in $(DESTDIR)$(includedir)..."
$(RMDIR) $(DESTDIR)$(includedir)/FL
$(INSTALL_DIR) $(DESTDIR)$(includedir)/FL
$(RMDIR) $(DESTDIR)$(includedir)/ntk/FL
$(INSTALL_DIR) $(DESTDIR)$(includedir)/ntk/FL
for file in *.[hH]; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/FL; \
$(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/ntk/FL; \
done
@HLINKS@ cd $(DESTDIR)$(includedir)/FL;\
@HLINKS@ cd $(DESTDIR)$(includedir)/ntk/FL;\
@HLINKS@ for file in *.H; do\
@HLINKS@ $(RM) "`basename $$file H`h";\
@HLINKS@ $(LN) $$file "`basename $$file H`h";\
@HLINKS@ done
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/FL/fl_file_chooser.H
@HLINKS@ $(LN) Fl_File_Chooser.H $(DESTDIR)$(includedir)/FL/fl_file_chooser.H
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/FL/fl_file_chooser.h
@HLINKS@ $(LN) Fl_File_Chooser.H $(DESTDIR)$(includedir)/FL/fl_file_chooser.h
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/Fl
@HLINKS@ $(LN) FL $(DESTDIR)$(includedir)/Fl
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/ntk/FL/fl_file_chooser.H
@HLINKS@ $(LN) Fl_File_Chooser.H $(DESTDIR)$(includedir)/ntk/FL/fl_file_chooser.H
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/ntk/FL/fl_file_chooser.h
@HLINKS@ $(LN) Fl_File_Chooser.H $(DESTDIR)$(includedir)/ntk/FL/fl_file_chooser.h
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/ntk/Fl
@HLINKS@ $(LN) FL $(DESTDIR)$(includedir)/ntk/Fl

uninstall:
echo "Uninstalling include files..."
$(RMDIR) $(DESTDIR)$(includedir)/FL
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/Fl
$(RMDIR) $(DESTDIR)$(includedir)/ntk/FL
@HLINKS@ $(RM) $(DESTDIR)$(includedir)/ntk/Fl


#


+ 4
- 4
ntk-config.in View File

@@ -41,7 +41,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
bindir=@bindir@
includedir=@includedir@
includedir=@includedir@/ntk
libdir=@libdir@
srcdir=@srcdir@

@@ -80,9 +80,9 @@ if test -f "$selfdir/FL/Fl_Window.H"; then
fi
fi

if test -d $includedir/FL/images; then
CFLAGS="-I$includedir/FL/images $CFLAGS"
CXXFLAGS="-I$includedir/FL/images $CXXFLAGS"
if test -d $includedir/ntk/FL/images; then
CFLAGS="-I$includedir/ntk/FL/images $CFLAGS"
CXXFLAGS="-I$includedir/ntk/FL/images $CXXFLAGS"
fi

# libraries to link with:


Loading…
Cancel
Save