diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-15 15:05:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-15 15:05:16 +0000 |
| commit | 1915b018a54e991c9289ee0c03488294e890caea (patch) | |
| tree | 0eccc8afdcbcee10f91cfe418fc8c7cdcd4b0163 /xorg-server/hw/xfree86/Makefile.am | |
| parent | 8bfa2f879ea38340a633c29120758a390b63667e (diff) | |
| parent | 4db64b701ca08687df5932321d48f2ef29b99fed (diff) | |
| download | vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.tar.gz vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.tar.bz2 vcxsrv-1915b018a54e991c9289ee0c03488294e890caea.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xfree86/Makefile.am | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am index b97ebd79f..48db5a14c 100644 --- a/xorg-server/hw/xfree86/Makefile.am +++ b/xorg-server/hw/xfree86/Makefile.am @@ -109,12 +109,7 @@ endif CPP_FILES_FLAGS = \ $(MANDEFS) \ - -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ - -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \ - -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \ - -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \ - -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \ - -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \ + -DDEFAULTFONTPATH="\"$(COMPILEDDEFAULTFONTPATH)\"" \ -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\" relink: |