diff --git a/FL/Makefile.in b/FL/Makefile.in index 00503e4..6fa93bb 100644 --- a/FL/Makefile.in +++ b/FL/Makefile.in @@ -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 # diff --git a/ntk-config.in b/ntk-config.in index 23df157..94adc15 100755 --- a/ntk-config.in +++ b/ntk-config.in @@ -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: