Ticket #28132: patch-setup.py.diff

File patch-setup.py.diff, 902 bytes (added by andrew.reusch@…, 14 years ago)
  • setup.py

    old new  
    4242            dirs = [ '/usr', sys.prefix ] + glob.glob('/opt/libpcap*') + \
    4343                   glob.glob('../libpcap*') + glob.glob('../wpdpack*')
    4444        for d in dirs:
    45             for sd in ('include', 'include/pcap', ''):
     45            for sd in ('include/pcap', 'include', ''):
    4646                incdirs = [ os.path.join(d, sd) ]
    4747                if os.path.exists(os.path.join(d, sd, 'pcap.h')):
    4848                    cfg['include_dirs'] = [ os.path.join(d, sd) ]
     
    7575            print "removing '%s'" % pcap_cache
    7676            os.unlink(pcap_cache)
    7777
    78 if len(sys.argv) > 1 and sys.argv[1] == 'build':
     78if len(sys.argv) > 1 and ('build' in sys.argv or 'install' in sys.argv):
    7979    try:
    8080        pcap_config = cPickle.load(open(pcap_cache))
    8181    except IOError: